From xen-changelog-bounces@lists.xen.org Mon Nov 03 16:55:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Nov 2014 16:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuK-0001gi-4E; Mon, 03 Nov 2014 16: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 1XlKuJ-0001ga-4g for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 79/95-24532-A63B7545; Mon, 03 Nov 2014 16:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1415033705!12401411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22980 invoked from network); 3 Nov 2014 16:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Nov 2014 16:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuG-0000gK-O7 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XlKuF-0004ii-S6 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:03 +0000 Date: Mon, 03 Nov 2014 16:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] process softirqs while dumping domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cf71226edabd8b9bc81a5eb57823dacbe8b4bd8 Author: Andrew Cooper AuthorDate: Fri Oct 31 11:28:36 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:28:36 2014 +0100 process softirqs while dumping domains Process softirqs once per domain, and once every 64 vcpus in a guest to avoid being hit by the NMI watchdog. Discovered against a VM which had accidentally been assigned 8192 vcpus. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli --- xen/common/keyhandler.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 809378c..a917726 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -253,6 +253,9 @@ static void dump_domains(unsigned char key) for_each_domain ( d ) { unsigned int i; + + process_pending_softirqs(); + printk("General information for domain %u:\n", d->domain_id); cpuset_print(tmpstr, sizeof(tmpstr), d->domain_dirty_cpumask); printk(" refcnt=%d dying=%d pause_count=%d\n", @@ -287,6 +290,9 @@ static void dump_domains(unsigned char key) d->domain_id); for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk(" VCPU%d: CPU%d [has=%c] poll=%d " "upcall_pend = %02x, upcall_mask = %02x ", v->vcpu_id, v->processor, @@ -311,6 +317,9 @@ static void dump_domains(unsigned char key) { for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk("Notifying guest %d:%d (virq %d, port %d)\n", d->domain_id, v->vcpu_id, VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 03 16:55:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Nov 2014 16:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuK-0001gi-4E; Mon, 03 Nov 2014 16: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 1XlKuJ-0001ga-4g for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 79/95-24532-A63B7545; Mon, 03 Nov 2014 16:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1415033705!12401411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22980 invoked from network); 3 Nov 2014 16:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Nov 2014 16:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuG-0000gK-O7 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XlKuF-0004ii-S6 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:03 +0000 Date: Mon, 03 Nov 2014 16:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] process softirqs while dumping domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cf71226edabd8b9bc81a5eb57823dacbe8b4bd8 Author: Andrew Cooper AuthorDate: Fri Oct 31 11:28:36 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:28:36 2014 +0100 process softirqs while dumping domains Process softirqs once per domain, and once every 64 vcpus in a guest to avoid being hit by the NMI watchdog. Discovered against a VM which had accidentally been assigned 8192 vcpus. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli --- xen/common/keyhandler.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 809378c..a917726 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -253,6 +253,9 @@ static void dump_domains(unsigned char key) for_each_domain ( d ) { unsigned int i; + + process_pending_softirqs(); + printk("General information for domain %u:\n", d->domain_id); cpuset_print(tmpstr, sizeof(tmpstr), d->domain_dirty_cpumask); printk(" refcnt=%d dying=%d pause_count=%d\n", @@ -287,6 +290,9 @@ static void dump_domains(unsigned char key) d->domain_id); for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk(" VCPU%d: CPU%d [has=%c] poll=%d " "upcall_pend = %02x, upcall_mask = %02x ", v->vcpu_id, v->processor, @@ -311,6 +317,9 @@ static void dump_domains(unsigned char key) { for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk("Notifying guest %d:%d (virq %d, port %d)\n", d->domain_id, v->vcpu_id, VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 03 16:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Nov 2014 16: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 1XlKuU-0001iK-7O; Mon, 03 Nov 2014 16:55:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuT-0001i9-95 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:17 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 2E/C0-09842-473B7545; Mon, 03 Nov 2014 16:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1415033715!9022464!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21202 invoked from network); 3 Nov 2014 16:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Nov 2014 16:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuR-0000gN-1f for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XlKuQ-0004oH-SH for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:14 +0000 Date: Mon, 03 Nov 2014 16:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93cc5c6f1641e90eb120826d42f103b7726efb8e Author: Jan Beulich AuthorDate: Fri Oct 31 11:31:11 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:31:11 2014 +0100 VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical A recent KVM change by Nadav Amit helped spot that we have the same issue as they did. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 29aaad4..79a69b1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2273,9 +2273,13 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) __vmwrite(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: { -- generated by git-patchbot for /home/xen/git/xen.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 03 16:55:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Nov 2014 16: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 1XlKuU-0001iK-7O; Mon, 03 Nov 2014 16:55:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuT-0001i9-95 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:17 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 2E/C0-09842-473B7545; Mon, 03 Nov 2014 16:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1415033715!9022464!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21202 invoked from network); 3 Nov 2014 16:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Nov 2014 16:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuR-0000gN-1f for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XlKuQ-0004oH-SH for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:14 +0000 Date: Mon, 03 Nov 2014 16:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93cc5c6f1641e90eb120826d42f103b7726efb8e Author: Jan Beulich AuthorDate: Fri Oct 31 11:31:11 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:31:11 2014 +0100 VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical A recent KVM change by Nadav Amit helped spot that we have the same issue as they did. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 29aaad4..79a69b1 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2273,9 +2273,13 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) __vmwrite(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: { -- generated by git-patchbot for /home/xen/git/xen.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 03 16:55:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Nov 2014 16:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuf-0001kA-BH; Mon, 03 Nov 2014 16: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 1XlKud-0001jv-T5 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:28 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id C7/AD-24124-F73B7545; Mon, 03 Nov 2014 16:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1415033725!10913822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10633 invoked from network); 3 Nov 2014 16:55:26 -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; 3 Nov 2014 16:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKub-0000ga-7h for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XlKub-0004od-4l for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:25 +0000 Date: Mon, 03 Nov 2014 16:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: only kill guest when unknown VM exit occurred in guest kernel 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 5283b310e14884341f51be35253cdd59c4cb034c Author: Jan Beulich AuthorDate: Fri Oct 31 11:32:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:32:27 2014 +0100 x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode A recent KVM change by Nadav Amit pointed out that unconditional VM exits (like VMX'es ones for the INVEPT, INVVPID, and XSETBV instructions) may result from guest user mode activity (in the example cases, e.g. prior to a privilege level check being done). Consequently convert the unconditional domain_crash() to a conditional one (when guest is in kernel mode) with the alternative of injecting #UD (when in user mode). This is meant to be a precaution against in-guest security issues introduced when any such VM exit becomes possible (on newer hardware) without the hypervisor immediately being aware of it. There are no such unhandled VM exits currently (and hence this is not an active security issue), but old (no longer security maintained) versions exhibit issues in the cases given as examples above. Suggested-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 6 +++++- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e3e1565..8aca6e6 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2680,7 +2680,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - domain_crash(v->domain); + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 79a69b1..0bf92b2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3161,8 +3161,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#lx)\n", exit_reason); - domain_crash(v->domain); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } 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 03 16:55:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 03 Nov 2014 16:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKuf-0001kA-BH; Mon, 03 Nov 2014 16: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 1XlKud-0001jv-T5 for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:28 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id C7/AD-24124-F73B7545; Mon, 03 Nov 2014 16:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1415033725!10913822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10633 invoked from network); 3 Nov 2014 16:55:26 -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; 3 Nov 2014 16:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XlKub-0000ga-7h for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XlKub-0004od-4l for xen-changelog@lists.xensource.com; Mon, 03 Nov 2014 16:55:25 +0000 Date: Mon, 03 Nov 2014 16:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: only kill guest when unknown VM exit occurred in guest kernel 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 5283b310e14884341f51be35253cdd59c4cb034c Author: Jan Beulich AuthorDate: Fri Oct 31 11:32:27 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:32:27 2014 +0100 x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode A recent KVM change by Nadav Amit pointed out that unconditional VM exits (like VMX'es ones for the INVEPT, INVVPID, and XSETBV instructions) may result from guest user mode activity (in the example cases, e.g. prior to a privilege level check being done). Consequently convert the unconditional domain_crash() to a conditional one (when guest is in kernel mode) with the alternative of injecting #UD (when in user mode). This is meant to be a precaution against in-guest security issues introduced when any such VM exit becomes possible (on newer hardware) without the hypervisor immediately being aware of it. There are no such unhandled VM exits currently (and hence this is not an active security issue), but old (no longer security maintained) versions exhibit issues in the cases given as examples above. Suggested-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 6 +++++- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e3e1565..8aca6e6 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2680,7 +2680,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - domain_crash(v->domain); + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 79a69b1..0bf92b2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3161,8 +3161,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#lx)\n", exit_reason); - domain_crash(v->domain); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } 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 10 13:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnov0-0004ZK-PB; Mon, 10 Nov 2014 13:22:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnov0-0004Z0-0p for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:06 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 9C/4B-02712-DFBB0645; Mon, 10 Nov 2014 13:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1415625723!12504127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26206 invoked from network); 10 Nov 2014 13:22: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; 10 Nov 2014 13:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnoux-0004ZR-KL for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnoux-0001bX-G5 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:03 +0000 Date: Mon, 10 Nov 2014 13:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: fix non-interactive parsing of grub1 config files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ee393f9d6528640c29a0554fdc6cb3e795fb6e8 Author: Simon Rowe AuthorDate: Mon Oct 27 16:00:14 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 4 10:00:37 2014 +0000 pygrub: fix non-interactive parsing of grub1 config files Changes to handle non-numeric default attributes for grub2 caused run_grub() to attempt to index into the images list using a string. Pull out the code that handles submenus into a new function and use that to ensure sel is numeric. Reported-by: David Scott Signed-off-by: Simon Rowe Reviewed-by: Boris Ostrovsky Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 1ae34a2..4cc846f 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -456,11 +456,9 @@ class Grub: del f self.cf.parse(buf) - def run(self): - timeout = int(self.cf.timeout) - + def image_index(self): if self.cf.default.isdigit(): - self.selected_image = int(self.cf.default) + sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in # "submenu0>submenu1>...>menuentry" and hope that it's unique. @@ -472,16 +470,23 @@ class Grub: break # Map string to index in images array - self.selected_image = 0 + sel = 0 for i in range(len(self.cf.images)): if self.cf.images[i].title == title: - self.selected_image = i + sel = i break # If the selected (default) image doesn't exist we select the first entry - if self.selected_image > len(self.cf.images): + if sel > len(self.cf.images): logging.warning("Default image not found") - self.selected_image = 0 + sel = 0 + + return sel + + def run(self): + timeout = int(self.cf.timeout) + self.selected_image = self.image_index() + self.isdone = False while not self.isdone: self.run_main(timeout) @@ -626,7 +631,7 @@ def run_grub(file, entry, fs, cfg_args): if interactive and not list_entries: curses.wrapper(run_main) else: - sel = g.cf.default + sel = g.image_index() # set the entry to boot as requested if entry is not None: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnov0-0004ZK-PB; Mon, 10 Nov 2014 13:22:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnov0-0004Z0-0p for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:06 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 9C/4B-02712-DFBB0645; Mon, 10 Nov 2014 13:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1415625723!12504127!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26206 invoked from network); 10 Nov 2014 13:22: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; 10 Nov 2014 13:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnoux-0004ZR-KL for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnoux-0001bX-G5 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:03 +0000 Date: Mon, 10 Nov 2014 13:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: fix non-interactive parsing of grub1 config files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ee393f9d6528640c29a0554fdc6cb3e795fb6e8 Author: Simon Rowe AuthorDate: Mon Oct 27 16:00:14 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 4 10:00:37 2014 +0000 pygrub: fix non-interactive parsing of grub1 config files Changes to handle non-numeric default attributes for grub2 caused run_grub() to attempt to index into the images list using a string. Pull out the code that handles submenus into a new function and use that to ensure sel is numeric. Reported-by: David Scott Signed-off-by: Simon Rowe Reviewed-by: Boris Ostrovsky Reviewed-and-tested-by: Andrew Cooper Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 1ae34a2..4cc846f 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -456,11 +456,9 @@ class Grub: del f self.cf.parse(buf) - def run(self): - timeout = int(self.cf.timeout) - + def image_index(self): if self.cf.default.isdigit(): - self.selected_image = int(self.cf.default) + sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in # "submenu0>submenu1>...>menuentry" and hope that it's unique. @@ -472,16 +470,23 @@ class Grub: break # Map string to index in images array - self.selected_image = 0 + sel = 0 for i in range(len(self.cf.images)): if self.cf.images[i].title == title: - self.selected_image = i + sel = i break # If the selected (default) image doesn't exist we select the first entry - if self.selected_image > len(self.cf.images): + if sel > len(self.cf.images): logging.warning("Default image not found") - self.selected_image = 0 + sel = 0 + + return sel + + def run(self): + timeout = int(self.cf.timeout) + self.selected_image = self.image_index() + self.isdone = False while not self.isdone: self.run_main(timeout) @@ -626,7 +631,7 @@ def run_grub(file, entry, fs, cfg_args): if interactive and not list_entries: curses.wrapper(run_main) else: - sel = g.cf.default + sel = g.image_index() # set the entry to boot as requested if entry is not None: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:22:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1XnovA-0004aV-Rw; Mon, 10 Nov 2014 13:22:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovA-0004aO-1Y for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:16 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 5F/3F-09842-70CB0645; Mon, 10 Nov 2014 13:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1415625734!12697104!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31300 invoked from network); 10 Nov 2014 13:22:14 -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; 10 Nov 2014 13:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnov7-0004ZU-Sb for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnov7-0001bw-Oz for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:13 +0000 Date: Mon, 10 Nov 2014 13:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/pygrub: Fix TOCTOU race introduced by c/s 63dcc68 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit beb0ef5f747bac4c6464383d74259b14adbfce19 Author: Andrew Cooper AuthorDate: Wed Oct 29 14:09:41 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 4 10:03:31 2014 +0000 tools/pygrub: Fix TOCTOU race introduced by c/s 63dcc68 In addition, use os.makedirs() which will also create intermediate directories if they don't exist. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Rzeszutek Wilk CC: Olaf Hering Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 4cc846f..aa7e562 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -13,7 +13,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import os, sys, string, struct, tempfile, re, traceback, stat +import os, sys, string, struct, tempfile, re, traceback, stat, errno import copy import logging import platform @@ -851,8 +851,14 @@ if __name__ == "__main__": if debug: logging.basicConfig(level=logging.DEBUG) - if not os.path.isdir(output_directory): - os.mkdir(output_directory, 0700) + + try: + os.makedirs(output_directory, 0700) + except OSError,e: + if (e.errno == errno.EEXIST) and os.path.isdir(output_directory): + pass + else: + raise if output is None or output == "-": fd = sys.stdout.fileno() -- generated by git-patchbot for /home/xen/git/xen.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 10 13:22:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1XnovA-0004aV-Rw; Mon, 10 Nov 2014 13:22:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovA-0004aO-1Y for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:16 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 5F/3F-09842-70CB0645; Mon, 10 Nov 2014 13:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1415625734!12697104!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31300 invoked from network); 10 Nov 2014 13:22:14 -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; 10 Nov 2014 13:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnov7-0004ZU-Sb for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnov7-0001bw-Oz for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:13 +0000 Date: Mon, 10 Nov 2014 13:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/pygrub: Fix TOCTOU race introduced by c/s 63dcc68 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit beb0ef5f747bac4c6464383d74259b14adbfce19 Author: Andrew Cooper AuthorDate: Wed Oct 29 14:09:41 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 4 10:03:31 2014 +0000 tools/pygrub: Fix TOCTOU race introduced by c/s 63dcc68 In addition, use os.makedirs() which will also create intermediate directories if they don't exist. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Konrad Rzeszutek Wilk CC: Olaf Hering Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 4cc846f..aa7e562 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -13,7 +13,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -import os, sys, string, struct, tempfile, re, traceback, stat +import os, sys, string, struct, tempfile, re, traceback, stat, errno import copy import logging import platform @@ -851,8 +851,14 @@ if __name__ == "__main__": if debug: logging.basicConfig(level=logging.DEBUG) - if not os.path.isdir(output_directory): - os.mkdir(output_directory, 0700) + + try: + os.makedirs(output_directory, 0700) + except OSError,e: + if (e.errno == errno.EEXIST) and os.path.isdir(output_directory): + pass + else: + raise if output is None or output == "-": fd = sys.stdout.fileno() -- generated by git-patchbot for /home/xen/git/xen.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 10 13:22:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovM-0004cy-VZ; Mon, 10 Nov 2014 13:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovM-0004cm-0h for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 16/FD-23865-21CB0645; Mon, 10 Nov 2014 13:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1415625744!9120451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13093 invoked from network); 10 Nov 2014 13:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovI-0004Zd-1o for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnovI-0001cR-0A for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:24 +0000 Date: Mon, 10 Nov 2014 13:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blktap: CONFIG_GCRYPT detection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6f78e851395394ece4385b65ad0788840db2b5d1 Author: Martin Pohlack AuthorDate: Tue Oct 28 13:35:21 2014 +0100 Commit: Ian Campbell CommitDate: Tue Nov 4 10:09:43 2014 +0000 blktap: CONFIG_GCRYPT detection Wrap make variable in () to allow correct evaluation. This fixes broken CONFIG_GCRYPT detection which was introduced by commit 85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4 in 2012. Signed-off-by: Martin Pohlack Reviewed-by: Uwe Dannowski Reviewed-by: Anthony Liguori Reviewed-by: Matt Wilson Acked-by: Ian Campbell --- tools/blktap/drivers/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 7461a95..cea8b3b 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -11,7 +11,7 @@ CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenstore) CFLAGS += -D_GNU_SOURCE -ifeq ($CONFIG_GCRYPT,y) +ifeq ($(CONFIG_GCRYPT),y) CFLAGS += -DUSE_GCRYPT CRYPT_LIB := -lgcrypt else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:22:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovM-0004cy-VZ; Mon, 10 Nov 2014 13:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovM-0004cm-0h for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 16/FD-23865-21CB0645; Mon, 10 Nov 2014 13:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1415625744!9120451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13093 invoked from network); 10 Nov 2014 13:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovI-0004Zd-1o for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnovI-0001cR-0A for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:24 +0000 Date: Mon, 10 Nov 2014 13:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blktap: CONFIG_GCRYPT detection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6f78e851395394ece4385b65ad0788840db2b5d1 Author: Martin Pohlack AuthorDate: Tue Oct 28 13:35:21 2014 +0100 Commit: Ian Campbell CommitDate: Tue Nov 4 10:09:43 2014 +0000 blktap: CONFIG_GCRYPT detection Wrap make variable in () to allow correct evaluation. This fixes broken CONFIG_GCRYPT detection which was introduced by commit 85896a7c4dc7b6b1dba2db79dfb0ca61738a92a4 in 2012. Signed-off-by: Martin Pohlack Reviewed-by: Uwe Dannowski Reviewed-by: Anthony Liguori Reviewed-by: Matt Wilson Acked-by: Ian Campbell --- tools/blktap/drivers/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/blktap/drivers/Makefile b/tools/blktap/drivers/Makefile index 7461a95..cea8b3b 100644 --- a/tools/blktap/drivers/Makefile +++ b/tools/blktap/drivers/Makefile @@ -11,7 +11,7 @@ CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenstore) CFLAGS += -D_GNU_SOURCE -ifeq ($CONFIG_GCRYPT,y) +ifeq ($(CONFIG_GCRYPT),y) CFLAGS += -DUSE_GCRYPT CRYPT_LIB := -lgcrypt else -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1XnovW-0004eK-1o; Mon, 10 Nov 2014 13:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovV-0004e6-22 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:37 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 5E/F5-14727-C1CB0645; Mon, 10 Nov 2014 13:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1415625754!6124342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7865 invoked from network); 10 Nov 2014 13:22:35 -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; 10 Nov 2014 13:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovS-0004Zl-8n for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnovS-0001dj-6c for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:34 +0000 Date: Mon, 10 Nov 2014 13:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: a domain can be dying but not shutdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9a1b736426b9ba5a96660ef3b23bb2f5100e79e Author: David Scott AuthorDate: Wed Oct 22 14:52:41 2014 +0100 Commit: Ian Campbell CommitDate: Tue Nov 4 10:25:40 2014 +0000 libxl: a domain can be dying but not shutdown The shutdown code is only present if the domain is shutdown. If we attempt to extract it from the flags from a dying but not shutdown domain then we get values like '255' which is not a valid LIBXL_SHUTDOWN_REASON_. We should use LIBXL_SHUTDOWN_UNKNOWN in this case. Signed-off-by: David Scott Acked-by: Rob Hoes Acked-by: Ian Campbell [ ijc -- updated comment in libxl_types.idl to match ] --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_types.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 18561fb..7e7d1df 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -609,7 +609,7 @@ static void xcinfo2xlinfo(libxl_ctx *ctx, xlinfo->blocked = !!(xcinfo->flags&XEN_DOMINF_blocked); xlinfo->running = !!(xcinfo->flags&XEN_DOMINF_running); - if (xlinfo->shutdown || xlinfo->dying) + if (xlinfo->shutdown) xlinfo->shutdown_reason = (xcinfo->flags>>XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; else xlinfo->shutdown_reason = LIBXL_SHUTDOWN_REASON_UNKNOWN; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ca3f724..f7fc695 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -260,7 +260,7 @@ libxl_dominfo = Struct("dominfo",[ ("shutdown", bool), ("dying", bool), - # Valid iff (shutdown||dying). + # Valid iff ->shutdown is true. # # Otherwise set to a value guaranteed not to clash with any valid # LIBXL_SHUTDOWN_REASON_* constant. -- generated by git-patchbot for /home/xen/git/xen.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 10 13:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1XnovW-0004eK-1o; Mon, 10 Nov 2014 13:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovV-0004e6-22 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:37 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 5E/F5-14727-C1CB0645; Mon, 10 Nov 2014 13:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1415625754!6124342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7865 invoked from network); 10 Nov 2014 13:22:35 -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; 10 Nov 2014 13:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnovS-0004Zl-8n for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnovS-0001dj-6c for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:34 +0000 Date: Mon, 10 Nov 2014 13:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: a domain can be dying but not shutdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c9a1b736426b9ba5a96660ef3b23bb2f5100e79e Author: David Scott AuthorDate: Wed Oct 22 14:52:41 2014 +0100 Commit: Ian Campbell CommitDate: Tue Nov 4 10:25:40 2014 +0000 libxl: a domain can be dying but not shutdown The shutdown code is only present if the domain is shutdown. If we attempt to extract it from the flags from a dying but not shutdown domain then we get values like '255' which is not a valid LIBXL_SHUTDOWN_REASON_. We should use LIBXL_SHUTDOWN_UNKNOWN in this case. Signed-off-by: David Scott Acked-by: Rob Hoes Acked-by: Ian Campbell [ ijc -- updated comment in libxl_types.idl to match ] --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_types.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 18561fb..7e7d1df 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -609,7 +609,7 @@ static void xcinfo2xlinfo(libxl_ctx *ctx, xlinfo->blocked = !!(xcinfo->flags&XEN_DOMINF_blocked); xlinfo->running = !!(xcinfo->flags&XEN_DOMINF_running); - if (xlinfo->shutdown || xlinfo->dying) + if (xlinfo->shutdown) xlinfo->shutdown_reason = (xcinfo->flags>>XEN_DOMINF_shutdownshift) & XEN_DOMINF_shutdownmask; else xlinfo->shutdown_reason = LIBXL_SHUTDOWN_REASON_UNKNOWN; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ca3f724..f7fc695 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -260,7 +260,7 @@ libxl_dominfo = Struct("dominfo",[ ("shutdown", bool), ("dying", bool), - # Valid iff (shutdown||dying). + # Valid iff ->shutdown is true. # # Otherwise set to a value guaranteed not to clash with any valid # LIBXL_SHUTDOWN_REASON_* constant. -- generated by git-patchbot for /home/xen/git/xen.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 10 13:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1Xnovg-0004fk-4g; Mon, 10 Nov 2014 13: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 1Xnove-0004fV-K2 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:46 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 89/21-02696-62CB0645; Mon, 10 Nov 2014 13:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1415625764!12484423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16297 invoked from network); 10 Nov 2014 13:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovc-0004Zr-E3 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnovc-0001eA-CS for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:44 +0000 Date: Mon, 10 Nov 2014 13:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PVH: replace bogus assertion with conditional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01c019c843df313f62ca5c106544026867da9e9e Author: Jan Beulich AuthorDate: Tue Nov 4 13:07:23 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:07:23 2014 +0100 x86/PVH: replace bogus assertion with conditional While PVH guests currently have to start in 64-bit mode, nothing keeps them from entering compatibility mode via a suitable ring-0 code selector and making a hypercall from there. Fail such attempts rather than asserting they won't happen. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 78f519d..8f49b44 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4876,10 +4876,10 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 0; } + else if ( unlikely(is_pvh_vcpu(curr)) ) + regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ 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, -- generated by git-patchbot for /home/xen/git/xen.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 10 13:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1Xnovg-0004fk-4g; Mon, 10 Nov 2014 13: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 1Xnove-0004fV-K2 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:46 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 89/21-02696-62CB0645; Mon, 10 Nov 2014 13:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1415625764!12484423!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16297 invoked from network); 10 Nov 2014 13:22:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovc-0004Zr-E3 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnovc-0001eA-CS for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:44 +0000 Date: Mon, 10 Nov 2014 13:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PVH: replace bogus assertion with conditional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 01c019c843df313f62ca5c106544026867da9e9e Author: Jan Beulich AuthorDate: Tue Nov 4 13:07:23 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:07:23 2014 +0100 x86/PVH: replace bogus assertion with conditional While PVH guests currently have to start in 64-bit mode, nothing keeps them from entering compatibility mode via a suitable ring-0 code selector and making a hypercall from there. Fail such attempts rather than asserting they won't happen. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 78f519d..8f49b44 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -4876,10 +4876,10 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 0; } + else if ( unlikely(is_pvh_vcpu(curr)) ) + regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ 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, -- generated by git-patchbot for /home/xen/git/xen.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 10 13:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1Xnovr-0004k0-7M; Mon, 10 Nov 2014 13: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 1Xnovp-0004je-Jg for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:57 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 07/6E-17735-03CB0645; Mon, 10 Nov 2014 13:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1415625774!11574164!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3087 invoked from network); 10 Nov 2014 13:22:55 -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; 10 Nov 2014 13:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovm-0004a0-Jj for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnovm-0001ef-ID for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:54 +0000 Date: Mon, 10 Nov 2014 13:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "lzo: properly check for overruns" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 092978f2ffcf017b95c6ca674e629268d46222b4 Author: Willy Tarreau AuthorDate: Tue Nov 4 13:08:32 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:08:32 2014 +0100 Revert "lzo: properly check for overruns" This reverts commit 504f70b6 ("lzo: properly check for overruns"). As analysed by Willem Pinckaers, this fix is still incomplete on certain rare corner cases, and it is easier to restart from the original code. Reported-by: Willem Pinckaers Signed-off-by: Willy Tarreau [original Linux commit: af958a38] Signed-off-by: Jan Beulich --- xen/common/lzo.c | 62 ++++++++++++++++++----------------------------------- 1 files changed, 21 insertions(+), 41 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index 0bec625..7338aee 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -375,31 +375,11 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, * Richard Purdie */ -#define HAVE_IP(t, x) \ - (((size_t)(ip_end - ip) >= (size_t)(t + x)) && \ - (((t + x) >= t) && ((t + x) >= x))) - -#define HAVE_OP(t, x) \ - (((size_t)(op_end - op) >= (size_t)(t + x)) && \ - (((t + x) >= t) && ((t + x) >= x))) - -#define NEED_IP(t, x) \ - do { \ - if (!HAVE_IP(t, x)) \ - goto input_overrun; \ - } while (0) - -#define NEED_OP(t, x) \ - do { \ - if (!HAVE_OP(t, x)) \ - goto output_overrun; \ - } while (0) - -#define TEST_LB(m_pos) \ - do { \ - if ((m_pos) < out) \ - goto lookbehind_overrun; \ - } while (0) +#define HAVE_IP(x) ((size_t)(ip_end - ip) >= (size_t)(x)) +#define HAVE_OP(x) ((size_t)(op_end - op) >= (size_t)(x)) +#define NEED_IP(x) if (!HAVE_IP(x)) goto input_overrun +#define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun +#define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) @@ -434,14 +414,14 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1, 0); + NEED_IP(1); } t += 15 + *ip++; } t += 3; copy_literal_run: #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(t, 15) && HAVE_OP(t, 15))) { + if (likely(HAVE_IP(t + 15) && HAVE_OP(t + 15))) { const unsigned char *ie = ip + t; unsigned char *oe = op + t; do { @@ -457,8 +437,8 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, } else #endif { - NEED_OP(t, 0); - NEED_IP(t, 3); + NEED_OP(t); + NEED_IP(t + 3); do { *op++ = *ip++; } while (--t > 0); @@ -471,7 +451,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos -= t >> 2; m_pos -= *ip++ << 2; TEST_LB(m_pos); - NEED_OP(2, 0); + NEED_OP(2); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -495,10 +475,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1, 0); + NEED_IP(1); } t += 31 + *ip++; - NEED_IP(2, 0); + NEED_IP(2); } m_pos = op - 1; next = get_unaligned_le16(ip); @@ -513,10 +493,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1, 0); + NEED_IP(1); } t += 7 + *ip++; - NEED_IP(2, 0); + NEED_IP(2); } next = get_unaligned_le16(ip); ip += 2; @@ -530,7 +510,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) if (op - m_pos >= 8) { unsigned char *oe = op + t; - if (likely(HAVE_OP(t, 15))) { + if (likely(HAVE_OP(t + 15))) { do { COPY8(op, m_pos); op += 8; @@ -540,7 +520,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos += 8; } while (op < oe); op = oe; - if (HAVE_IP(6, 0)) { + if (HAVE_IP(6)) { state = next; COPY4(op, ip); op += next; @@ -548,7 +528,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, continue; } } else { - NEED_OP(t, 0); + NEED_OP(t); do { *op++ = *m_pos++; } while (op < oe); @@ -557,7 +537,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #endif { unsigned char *oe = op + t; - NEED_OP(t, 0); + NEED_OP(t); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -570,15 +550,15 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, state = next; t = next; #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(6, 0) && HAVE_OP(4, 0))) { + if (likely(HAVE_IP(6) && HAVE_OP(4))) { COPY4(op, ip); op += t; ip += t; } else #endif { - NEED_IP(t, 3); - NEED_OP(t, 0); + NEED_IP(t + 3); + NEED_OP(t); while (t > 0) { *op++ = *ip++; t--; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1Xnovr-0004k0-7M; Mon, 10 Nov 2014 13: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 1Xnovp-0004je-Jg for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:57 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 07/6E-17735-03CB0645; Mon, 10 Nov 2014 13:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1415625774!11574164!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3087 invoked from network); 10 Nov 2014 13:22:55 -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; 10 Nov 2014 13:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovm-0004a0-Jj for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnovm-0001ef-ID for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:22:54 +0000 Date: Mon, 10 Nov 2014 13:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "lzo: properly check for overruns" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 092978f2ffcf017b95c6ca674e629268d46222b4 Author: Willy Tarreau AuthorDate: Tue Nov 4 13:08:32 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:08:32 2014 +0100 Revert "lzo: properly check for overruns" This reverts commit 504f70b6 ("lzo: properly check for overruns"). As analysed by Willem Pinckaers, this fix is still incomplete on certain rare corner cases, and it is easier to restart from the original code. Reported-by: Willem Pinckaers Signed-off-by: Willy Tarreau [original Linux commit: af958a38] Signed-off-by: Jan Beulich --- xen/common/lzo.c | 62 ++++++++++++++++++----------------------------------- 1 files changed, 21 insertions(+), 41 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index 0bec625..7338aee 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -375,31 +375,11 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, * Richard Purdie */ -#define HAVE_IP(t, x) \ - (((size_t)(ip_end - ip) >= (size_t)(t + x)) && \ - (((t + x) >= t) && ((t + x) >= x))) - -#define HAVE_OP(t, x) \ - (((size_t)(op_end - op) >= (size_t)(t + x)) && \ - (((t + x) >= t) && ((t + x) >= x))) - -#define NEED_IP(t, x) \ - do { \ - if (!HAVE_IP(t, x)) \ - goto input_overrun; \ - } while (0) - -#define NEED_OP(t, x) \ - do { \ - if (!HAVE_OP(t, x)) \ - goto output_overrun; \ - } while (0) - -#define TEST_LB(m_pos) \ - do { \ - if ((m_pos) < out) \ - goto lookbehind_overrun; \ - } while (0) +#define HAVE_IP(x) ((size_t)(ip_end - ip) >= (size_t)(x)) +#define HAVE_OP(x) ((size_t)(op_end - op) >= (size_t)(x)) +#define NEED_IP(x) if (!HAVE_IP(x)) goto input_overrun +#define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun +#define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) @@ -434,14 +414,14 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1, 0); + NEED_IP(1); } t += 15 + *ip++; } t += 3; copy_literal_run: #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(t, 15) && HAVE_OP(t, 15))) { + if (likely(HAVE_IP(t + 15) && HAVE_OP(t + 15))) { const unsigned char *ie = ip + t; unsigned char *oe = op + t; do { @@ -457,8 +437,8 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, } else #endif { - NEED_OP(t, 0); - NEED_IP(t, 3); + NEED_OP(t); + NEED_IP(t + 3); do { *op++ = *ip++; } while (--t > 0); @@ -471,7 +451,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos -= t >> 2; m_pos -= *ip++ << 2; TEST_LB(m_pos); - NEED_OP(2, 0); + NEED_OP(2); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -495,10 +475,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1, 0); + NEED_IP(1); } t += 31 + *ip++; - NEED_IP(2, 0); + NEED_IP(2); } m_pos = op - 1; next = get_unaligned_le16(ip); @@ -513,10 +493,10 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, while (unlikely(*ip == 0)) { t += 255; ip++; - NEED_IP(1, 0); + NEED_IP(1); } t += 7 + *ip++; - NEED_IP(2, 0); + NEED_IP(2); } next = get_unaligned_le16(ip); ip += 2; @@ -530,7 +510,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) if (op - m_pos >= 8) { unsigned char *oe = op + t; - if (likely(HAVE_OP(t, 15))) { + if (likely(HAVE_OP(t + 15))) { do { COPY8(op, m_pos); op += 8; @@ -540,7 +520,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos += 8; } while (op < oe); op = oe; - if (HAVE_IP(6, 0)) { + if (HAVE_IP(6)) { state = next; COPY4(op, ip); op += next; @@ -548,7 +528,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, continue; } } else { - NEED_OP(t, 0); + NEED_OP(t); do { *op++ = *m_pos++; } while (op < oe); @@ -557,7 +537,7 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, #endif { unsigned char *oe = op + t; - NEED_OP(t, 0); + NEED_OP(t); op[0] = m_pos[0]; op[1] = m_pos[1]; op += 2; @@ -570,15 +550,15 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, state = next; t = next; #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) - if (likely(HAVE_IP(6, 0) && HAVE_OP(4, 0))) { + if (likely(HAVE_IP(6) && HAVE_OP(4))) { COPY4(op, ip); op += t; ip += t; } else #endif { - NEED_IP(t, 3); - NEED_OP(t, 0); + NEED_IP(t + 3); + NEED_OP(t); while (t > 0) { *op++ = *ip++; t--; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:23:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1Xnow1-0004lV-Ag; Mon, 10 Nov 2014 13:23:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovz-0004lH-SE for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:08 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 8A/B3-01660-B3CB0645; Mon, 10 Nov 2014 13:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1415625785!11526000!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12526 invoked from network); 10 Nov 2014 13:23: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; 10 Nov 2014 13:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovw-0004aX-PB for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnovw-0001fB-NQ for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:04 +0000 Date: Mon, 10 Nov 2014 13:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lzo: check for length overrun in variable length encoding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10a94ddbd2eb97365872cd14be93837c4613e09d Author: Willy Tarreau AuthorDate: Tue Nov 4 13:09:09 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:11:06 2014 +0100 lzo: check for length overrun in variable length encoding This fix ensures that we never meet an integer overflow while adding 255 while parsing a variable length encoding. It works differently from commit 504f70b6 ("lzo: properly check for overruns") because instead of ensuring that we don't overrun the input, which is tricky to guarantee due to many assumptions in the code, it simply checks that the cumulated number of 255 read cannot overflow by bounding this number. The MAX_255_COUNT is the maximum number of times we can add 255 to a base count without overflowing an integer. The multiply will overflow when multiplying 255 by more than MAXINT/255. The sum will overflow earlier depending on the base count. Since the base count is taken from a u8 and a few bits, it is safe to assume that it will always be lower than or equal to 2*255, thus we can always prevent any overflow by accepting two less 255 steps. This patch also reduces the CPU overhead and actually increases performance by 1.1% compared to the initial code, while the previous fix costs 3.1% (measured on x86_64). The fix needs to be backported to all currently supported stable kernels. Reported-by: Willem Pinckaers Signed-off-by: Willy Tarreau [original Linux commit: 72cf9012] Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lzo.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index 7338aee..74831cb 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -381,6 +381,16 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, #define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun #define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun +/* This MAX_255_COUNT is the maximum number of times we can add 255 to a base + * count without overflowing an integer. The multiply will overflow when + * multiplying 255 by more than MAXINT/255. The sum will overflow earlier + * depending on the base count. Since the base count is taken from a u8 + * and a few bits, it is safe to assume that it will always be lower than + * or equal to 2*255, thus we can always prevent any overflow by accepting + * two less 255 steps. See Documentation/lzo.txt for more information. + */ +#define MAX_255_COUNT ((((size_t)~0) / 255) - 2) + int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { @@ -411,12 +421,19 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, if (t < 16) { if (likely(state == 0)) { if (unlikely(t == 0)) { + size_t offset; + const unsigned char *ip_last = ip; + while (unlikely(*ip == 0)) { - t += 255; ip++; NEED_IP(1); } - t += 15 + *ip++; + offset = ip - ip_last; + if (unlikely(offset > MAX_255_COUNT)) + return LZO_E_ERROR; + + offset = (offset << 8) - offset; + t += offset + 15 + *ip++; } t += 3; copy_literal_run: @@ -472,12 +489,19 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, } else if (t >= 32) { t = (t & 31) + (3 - 1); if (unlikely(t == 2)) { + size_t offset; + const unsigned char *ip_last = ip; + while (unlikely(*ip == 0)) { - t += 255; ip++; NEED_IP(1); } - t += 31 + *ip++; + offset = ip - ip_last; + if (unlikely(offset > MAX_255_COUNT)) + return LZO_E_ERROR; + + offset = (offset << 8) - offset; + t += offset + 31 + *ip++; NEED_IP(2); } m_pos = op - 1; @@ -490,12 +514,19 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos -= (t & 8) << 11; t = (t & 7) + (3 - 1); if (unlikely(t == 2)) { + size_t offset; + const unsigned char *ip_last = ip; + while (unlikely(*ip == 0)) { - t += 255; ip++; NEED_IP(1); } - t += 7 + *ip++; + offset = ip - ip_last; + if (unlikely(offset > MAX_255_COUNT)) + return LZO_E_ERROR; + + offset = (offset << 8) - offset; + t += offset + 7 + *ip++; NEED_IP(2); } next = get_unaligned_le16(ip); -- generated by git-patchbot for /home/xen/git/xen.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 10 13:23:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1Xnow1-0004lV-Ag; Mon, 10 Nov 2014 13:23:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovz-0004lH-SE for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:08 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 8A/B3-01660-B3CB0645; Mon, 10 Nov 2014 13:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1415625785!11526000!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12526 invoked from network); 10 Nov 2014 13:23: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; 10 Nov 2014 13:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnovw-0004aX-PB for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnovw-0001fB-NQ for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:04 +0000 Date: Mon, 10 Nov 2014 13:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lzo: check for length overrun in variable length encoding X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10a94ddbd2eb97365872cd14be93837c4613e09d Author: Willy Tarreau AuthorDate: Tue Nov 4 13:09:09 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:11:06 2014 +0100 lzo: check for length overrun in variable length encoding This fix ensures that we never meet an integer overflow while adding 255 while parsing a variable length encoding. It works differently from commit 504f70b6 ("lzo: properly check for overruns") because instead of ensuring that we don't overrun the input, which is tricky to guarantee due to many assumptions in the code, it simply checks that the cumulated number of 255 read cannot overflow by bounding this number. The MAX_255_COUNT is the maximum number of times we can add 255 to a base count without overflowing an integer. The multiply will overflow when multiplying 255 by more than MAXINT/255. The sum will overflow earlier depending on the base count. Since the base count is taken from a u8 and a few bits, it is safe to assume that it will always be lower than or equal to 2*255, thus we can always prevent any overflow by accepting two less 255 steps. This patch also reduces the CPU overhead and actually increases performance by 1.1% compared to the initial code, while the previous fix costs 3.1% (measured on x86_64). The fix needs to be backported to all currently supported stable kernels. Reported-by: Willem Pinckaers Signed-off-by: Willy Tarreau [original Linux commit: 72cf9012] Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/lzo.c | 43 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 37 insertions(+), 6 deletions(-) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index 7338aee..74831cb 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -381,6 +381,16 @@ int lzo1x_1_compress(const unsigned char *in, size_t in_len, #define NEED_OP(x) if (!HAVE_OP(x)) goto output_overrun #define TEST_LB(m_pos) if ((m_pos) < out) goto lookbehind_overrun +/* This MAX_255_COUNT is the maximum number of times we can add 255 to a base + * count without overflowing an integer. The multiply will overflow when + * multiplying 255 by more than MAXINT/255. The sum will overflow earlier + * depending on the base count. Since the base count is taken from a u8 + * and a few bits, it is safe to assume that it will always be lower than + * or equal to 2*255, thus we can always prevent any overflow by accepting + * two less 255 steps. See Documentation/lzo.txt for more information. + */ +#define MAX_255_COUNT ((((size_t)~0) / 255) - 2) + int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { @@ -411,12 +421,19 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, if (t < 16) { if (likely(state == 0)) { if (unlikely(t == 0)) { + size_t offset; + const unsigned char *ip_last = ip; + while (unlikely(*ip == 0)) { - t += 255; ip++; NEED_IP(1); } - t += 15 + *ip++; + offset = ip - ip_last; + if (unlikely(offset > MAX_255_COUNT)) + return LZO_E_ERROR; + + offset = (offset << 8) - offset; + t += offset + 15 + *ip++; } t += 3; copy_literal_run: @@ -472,12 +489,19 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, } else if (t >= 32) { t = (t & 31) + (3 - 1); if (unlikely(t == 2)) { + size_t offset; + const unsigned char *ip_last = ip; + while (unlikely(*ip == 0)) { - t += 255; ip++; NEED_IP(1); } - t += 31 + *ip++; + offset = ip - ip_last; + if (unlikely(offset > MAX_255_COUNT)) + return LZO_E_ERROR; + + offset = (offset << 8) - offset; + t += offset + 31 + *ip++; NEED_IP(2); } m_pos = op - 1; @@ -490,12 +514,19 @@ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, m_pos -= (t & 8) << 11; t = (t & 7) + (3 - 1); if (unlikely(t == 2)) { + size_t offset; + const unsigned char *ip_last = ip; + while (unlikely(*ip == 0)) { - t += 255; ip++; NEED_IP(1); } - t += 7 + *ip++; + offset = ip - ip_last; + if (unlikely(offset > MAX_255_COUNT)) + return LZO_E_ERROR; + + offset = (offset << 8) - offset; + t += offset + 7 + *ip++; NEED_IP(2); } next = get_unaligned_le16(ip); -- generated by git-patchbot for /home/xen/git/xen.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 10 13:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowC-0004nO-FL; Mon, 10 Nov 2014 13:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowA-0004n6-Ub for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:19 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 11/F9-18267-64CB0645; Mon, 10 Nov 2014 13:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1415625795!11440095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30222 invoked from network); 10 Nov 2014 13:23:16 -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; 10 Nov 2014 13:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnow7-0004ai-H2 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnow7-0001fk-Dw for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:15 +0000 Date: Mon, 10 Nov 2014 13:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: ignore EFI commandline, skip console setup when booted from GRUB X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c38cf865ec82f27c62a60f0edfc717a5dc5fc6b4 Author: Roy Franz AuthorDate: Tue Nov 4 13:13:26 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:13:26 2014 +0100 EFI: ignore EFI commandline, skip console setup when booted from GRUB Update EFI code to completely ignore the EFI comnandline when booted from GRUB. Previusly it was parsed of EFI boot specific options, but these aren't used when booted from GRUB. Don't do EFI console or video configuration when booted by GRUB. The EFI boot code does some console and video initialization to support native EFI boot from the EFI boot manager or EFI shell. This initlization should not be done when booted using GRUB. Update EFI documentation to indicate that it describes EFI native boot, and does not apply at all when Xen is booted using GRUB. Signed-off-by: Roy Franz --- docs/misc/efi.markdown | 5 + xen/common/efi/boot.c | 240 ++++++++++++++++++++++++----------------------- 2 files changed, 128 insertions(+), 117 deletions(-) diff --git a/docs/misc/efi.markdown b/docs/misc/efi.markdown index 5e48aa3..f435ec7 100644 --- a/docs/misc/efi.markdown +++ b/docs/misc/efi.markdown @@ -29,6 +29,11 @@ separators will be tried) to be present in the same directory as the binary. (To illustrate the name handling, a binary named `xen-4.2-unstable.efi` would try `xen-4.2-unstable.cfg`, `xen-4.2.cfg`, `xen-4.cfg`, and `xen.cfg` in order.) One can override this with a command line option (`-cfg=`). +This configuration file and EFI commandline are only used for booting directly +from EFI firmware, or when using an EFI loader that does not support +the multiboot2 protocol. When booting using GRUB or another multiboot aware +loader the EFI commandline is ignored and all information is passed from +the loader to Xen using the multiboot protocol. The configuration file consists of one or more sections headed by a section name enclosed in square brackets, with individual values specified in each diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3a71d7a..3c63c0a 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -697,7 +697,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_STATUS status; unsigned int i, argc; CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; - UINTN cols, rows, depth, size, map_key, info_size, gop_mode = ~0; + UINTN map_key, info_size, gop_mode = ~0; EFI_HANDLE *handles = NULL; EFI_SHIM_LOCK_PROTOCOL *shim_lock; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; @@ -705,6 +705,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) union string section = { NULL }, name; bool_t base_video = 0; char *option_str; + bool_t use_cfg_file; efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; @@ -717,6 +718,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) StdOut = SystemTable->ConOut; StdErr = SystemTable->StdErr ?: StdOut; + use_cfg_file = efi_arch_use_config_file(SystemTable); status = efi_bs->HandleProtocol(ImageHandle, &loaded_image_guid, (void **)&loaded_image); @@ -725,67 +727,71 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_load_addr_check(loaded_image); - argc = get_argv(0, NULL, loaded_image->LoadOptions, - loaded_image->LoadOptionsSize, NULL); - if ( argc > 0 && - efi_bs->AllocatePool(EfiLoaderData, - (argc + 1) * sizeof(*argv) + - loaded_image->LoadOptionsSize, - (void **)&argv) == EFI_SUCCESS ) - get_argv(argc, argv, loaded_image->LoadOptions, - loaded_image->LoadOptionsSize, &options); - else - argc = 0; - for ( i = 1; i < argc; ++i ) + if ( use_cfg_file ) { - CHAR16 *ptr = argv[i]; - - if ( !ptr ) - break; - if ( *ptr == L'/' || *ptr == L'-' ) + argc = get_argv(0, NULL, loaded_image->LoadOptions, + loaded_image->LoadOptionsSize, NULL); + if ( argc > 0 && + efi_bs->AllocatePool(EfiLoaderData, + (argc + 1) * sizeof(*argv) + + loaded_image->LoadOptionsSize, + (void **)&argv) == EFI_SUCCESS ) + get_argv(argc, argv, loaded_image->LoadOptions, + loaded_image->LoadOptionsSize, &options); + else + argc = 0; + for ( i = 1; i < argc; ++i ) { - if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) - base_video = 1; - else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) - cfg_file_name = ptr + 5; - else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) - cfg_file_name = argv[++i]; - else if ( wstrcmp(ptr + 1, L"help") == 0 || - (ptr[1] == L'?' && !ptr[2]) ) + CHAR16 *ptr = argv[i]; + + if ( !ptr ) + break; + if ( *ptr == L'/' || *ptr == L'-' ) { - PrintStr(L"Xen EFI Loader options:\r\n"); - PrintStr(L"-basevideo retain current video mode\r\n"); - PrintStr(L"-cfg= specify configuration file\r\n"); - PrintStr(L"-help, -? display this help\r\n"); - blexit(NULL); + if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) + base_video = 1; + else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) + cfg_file_name = ptr + 5; + else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) + cfg_file_name = argv[++i]; + else if ( wstrcmp(ptr + 1, L"help") == 0 || + (ptr[1] == L'?' && !ptr[2]) ) + { + PrintStr(L"Xen EFI Loader options:\r\n"); + PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-cfg= specify configuration file\r\n"); + PrintStr(L"-help, -? display this help\r\n"); + blexit(NULL); + } + else + { + PrintStr(L"WARNING: Unknown command line option '"); + PrintStr(ptr); + PrintStr(L"' ignored\r\n"); + } } else - { - PrintStr(L"WARNING: Unknown command line option '"); - PrintStr(ptr); - PrintStr(L"' ignored\r\n"); - } + section.w = ptr; } - else - section.w = ptr; - } - if ( !base_video ) - { - unsigned int best; - - for ( i = 0, size = 0, best = StdOut->Mode->Mode; - i < StdOut->Mode->MaxMode; ++i ) + if ( !base_video ) { - if ( StdOut->QueryMode(StdOut, i, &cols, &rows) == EFI_SUCCESS && - cols * rows > size ) + unsigned int best; + UINTN cols, rows, size; + + for ( i = 0, size = 0, best = StdOut->Mode->Mode; + i < StdOut->Mode->MaxMode; ++i ) { - size = cols * rows; - best = i; + if ( StdOut->QueryMode(StdOut, i, &cols, &rows) == EFI_SUCCESS && + cols * rows > size ) + { + size = cols * rows; + best = i; + } } + if ( best != StdOut->Mode->Mode ) + StdOut->SetMode(StdOut, best); } - if ( best != StdOut->Mode->Mode ) - StdOut->SetMode(StdOut, best); } PrintStr(L"Xen " __stringify(XEN_VERSION) "." __stringify(XEN_SUBVERSION) @@ -793,37 +799,38 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_relocate_image(0); - if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, - &cols, &rows) == EFI_SUCCESS ) - efi_arch_console_init(cols, rows); - - size = 0; - status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, NULL); - if ( status == EFI_BUFFER_TOO_SMALL ) - status = efi_bs->AllocatePool(EfiLoaderData, size, (void **)&handles); - if ( !EFI_ERROR(status) ) - status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, - handles); - if ( EFI_ERROR(status) ) - size = 0; - for ( i = 0; i < size / sizeof(*handles); ++i ) - { - status = efi_bs->HandleProtocol(handles[i], &gop_guid, (void **)&gop); - if ( EFI_ERROR(status) ) - continue; - status = gop->QueryMode(gop, gop->Mode->Mode, &info_size, &mode_info); - if ( !EFI_ERROR(status) ) - break; - } - if ( handles ) - efi_bs->FreePool(handles); - if ( EFI_ERROR(status) ) - gop = NULL; - - cols = rows = depth = 0; - if ( efi_arch_use_config_file(SystemTable) ) + if ( use_cfg_file ) { EFI_FILE_HANDLE dir_handle; + UINTN depth, cols, rows, size; + + size = cols = rows = depth = 0; + + if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, + &cols, &rows) == EFI_SUCCESS ) + efi_arch_console_init(cols, rows); + + status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, NULL); + if ( status == EFI_BUFFER_TOO_SMALL ) + status = efi_bs->AllocatePool(EfiLoaderData, size, (void **)&handles); + if ( !EFI_ERROR(status) ) + status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, + handles); + if ( EFI_ERROR(status) ) + size = 0; + for ( i = 0; i < size / sizeof(*handles); ++i ) + { + status = efi_bs->HandleProtocol(handles[i], &gop_guid, (void **)&gop); + if ( EFI_ERROR(status) ) + continue; + status = gop->QueryMode(gop, gop->Mode->Mode, &info_size, &mode_info); + if ( !EFI_ERROR(status) ) + break; + } + if ( handles ) + efi_bs->FreePool(handles); + if ( EFI_ERROR(status) ) + gop = NULL; /* Get the file system interface. */ dir_handle = get_parent_handle(loaded_image, &file_name); @@ -931,45 +938,44 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) dir_handle->Close(dir_handle); - } - - if ( gop && !base_video ) - { - for ( i = size = 0; i < gop->Mode->MaxMode; ++i ) + if ( gop && !base_video ) { - unsigned int bpp = 0; - - status = gop->QueryMode(gop, i, &info_size, &mode_info); - if ( EFI_ERROR(status) ) - continue; - switch ( mode_info->PixelFormat ) - { - case PixelBitMask: - bpp = hweight32(mode_info->PixelInformation.RedMask | - mode_info->PixelInformation.GreenMask | - mode_info->PixelInformation.BlueMask); - break; - case PixelRedGreenBlueReserved8BitPerColor: - case PixelBlueGreenRedReserved8BitPerColor: - bpp = 24; - break; - default: - continue; - } - if ( cols == mode_info->HorizontalResolution && - rows == mode_info->VerticalResolution && - (!depth || bpp == depth) ) + for ( i = size = 0; i < gop->Mode->MaxMode; ++i ) { - gop_mode = i; - break; - } - if ( !cols && !rows && - mode_info->HorizontalResolution * - mode_info->VerticalResolution > size ) - { - size = mode_info->HorizontalResolution * - mode_info->VerticalResolution; - gop_mode = i; + unsigned int bpp = 0; + + status = gop->QueryMode(gop, i, &info_size, &mode_info); + if ( EFI_ERROR(status) ) + continue; + switch ( mode_info->PixelFormat ) + { + case PixelBitMask: + bpp = hweight32(mode_info->PixelInformation.RedMask | + mode_info->PixelInformation.GreenMask | + mode_info->PixelInformation.BlueMask); + break; + case PixelRedGreenBlueReserved8BitPerColor: + case PixelBlueGreenRedReserved8BitPerColor: + bpp = 24; + break; + default: + continue; + } + if ( cols == mode_info->HorizontalResolution && + rows == mode_info->VerticalResolution && + (!depth || bpp == depth) ) + { + gop_mode = i; + break; + } + if ( !cols && !rows && + mode_info->HorizontalResolution * + mode_info->VerticalResolution > size ) + { + size = mode_info->HorizontalResolution * + mode_info->VerticalResolution; + gop_mode = i; + } } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowC-0004nO-FL; Mon, 10 Nov 2014 13:23:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowA-0004n6-Ub for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:19 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 11/F9-18267-64CB0645; Mon, 10 Nov 2014 13:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1415625795!11440095!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30222 invoked from network); 10 Nov 2014 13:23:16 -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; 10 Nov 2014 13:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnow7-0004ai-H2 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnow7-0001fk-Dw for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:15 +0000 Date: Mon, 10 Nov 2014 13:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: ignore EFI commandline, skip console setup when booted from GRUB X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c38cf865ec82f27c62a60f0edfc717a5dc5fc6b4 Author: Roy Franz AuthorDate: Tue Nov 4 13:13:26 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:13:26 2014 +0100 EFI: ignore EFI commandline, skip console setup when booted from GRUB Update EFI code to completely ignore the EFI comnandline when booted from GRUB. Previusly it was parsed of EFI boot specific options, but these aren't used when booted from GRUB. Don't do EFI console or video configuration when booted by GRUB. The EFI boot code does some console and video initialization to support native EFI boot from the EFI boot manager or EFI shell. This initlization should not be done when booted using GRUB. Update EFI documentation to indicate that it describes EFI native boot, and does not apply at all when Xen is booted using GRUB. Signed-off-by: Roy Franz --- docs/misc/efi.markdown | 5 + xen/common/efi/boot.c | 240 ++++++++++++++++++++++++----------------------- 2 files changed, 128 insertions(+), 117 deletions(-) diff --git a/docs/misc/efi.markdown b/docs/misc/efi.markdown index 5e48aa3..f435ec7 100644 --- a/docs/misc/efi.markdown +++ b/docs/misc/efi.markdown @@ -29,6 +29,11 @@ separators will be tried) to be present in the same directory as the binary. (To illustrate the name handling, a binary named `xen-4.2-unstable.efi` would try `xen-4.2-unstable.cfg`, `xen-4.2.cfg`, `xen-4.cfg`, and `xen.cfg` in order.) One can override this with a command line option (`-cfg=`). +This configuration file and EFI commandline are only used for booting directly +from EFI firmware, or when using an EFI loader that does not support +the multiboot2 protocol. When booting using GRUB or another multiboot aware +loader the EFI commandline is ignored and all information is passed from +the loader to Xen using the multiboot protocol. The configuration file consists of one or more sections headed by a section name enclosed in square brackets, with individual values specified in each diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3a71d7a..3c63c0a 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -697,7 +697,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_STATUS status; unsigned int i, argc; CHAR16 **argv, *file_name, *cfg_file_name = NULL, *options = NULL; - UINTN cols, rows, depth, size, map_key, info_size, gop_mode = ~0; + UINTN map_key, info_size, gop_mode = ~0; EFI_HANDLE *handles = NULL; EFI_SHIM_LOCK_PROTOCOL *shim_lock; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; @@ -705,6 +705,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) union string section = { NULL }, name; bool_t base_video = 0; char *option_str; + bool_t use_cfg_file; efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; @@ -717,6 +718,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) StdOut = SystemTable->ConOut; StdErr = SystemTable->StdErr ?: StdOut; + use_cfg_file = efi_arch_use_config_file(SystemTable); status = efi_bs->HandleProtocol(ImageHandle, &loaded_image_guid, (void **)&loaded_image); @@ -725,67 +727,71 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_load_addr_check(loaded_image); - argc = get_argv(0, NULL, loaded_image->LoadOptions, - loaded_image->LoadOptionsSize, NULL); - if ( argc > 0 && - efi_bs->AllocatePool(EfiLoaderData, - (argc + 1) * sizeof(*argv) + - loaded_image->LoadOptionsSize, - (void **)&argv) == EFI_SUCCESS ) - get_argv(argc, argv, loaded_image->LoadOptions, - loaded_image->LoadOptionsSize, &options); - else - argc = 0; - for ( i = 1; i < argc; ++i ) + if ( use_cfg_file ) { - CHAR16 *ptr = argv[i]; - - if ( !ptr ) - break; - if ( *ptr == L'/' || *ptr == L'-' ) + argc = get_argv(0, NULL, loaded_image->LoadOptions, + loaded_image->LoadOptionsSize, NULL); + if ( argc > 0 && + efi_bs->AllocatePool(EfiLoaderData, + (argc + 1) * sizeof(*argv) + + loaded_image->LoadOptionsSize, + (void **)&argv) == EFI_SUCCESS ) + get_argv(argc, argv, loaded_image->LoadOptions, + loaded_image->LoadOptionsSize, &options); + else + argc = 0; + for ( i = 1; i < argc; ++i ) { - if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) - base_video = 1; - else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) - cfg_file_name = ptr + 5; - else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) - cfg_file_name = argv[++i]; - else if ( wstrcmp(ptr + 1, L"help") == 0 || - (ptr[1] == L'?' && !ptr[2]) ) + CHAR16 *ptr = argv[i]; + + if ( !ptr ) + break; + if ( *ptr == L'/' || *ptr == L'-' ) { - PrintStr(L"Xen EFI Loader options:\r\n"); - PrintStr(L"-basevideo retain current video mode\r\n"); - PrintStr(L"-cfg= specify configuration file\r\n"); - PrintStr(L"-help, -? display this help\r\n"); - blexit(NULL); + if ( wstrcmp(ptr + 1, L"basevideo") == 0 ) + base_video = 1; + else if ( wstrncmp(ptr + 1, L"cfg=", 4) == 0 ) + cfg_file_name = ptr + 5; + else if ( i + 1 < argc && wstrcmp(ptr + 1, L"cfg") == 0 ) + cfg_file_name = argv[++i]; + else if ( wstrcmp(ptr + 1, L"help") == 0 || + (ptr[1] == L'?' && !ptr[2]) ) + { + PrintStr(L"Xen EFI Loader options:\r\n"); + PrintStr(L"-basevideo retain current video mode\r\n"); + PrintStr(L"-cfg= specify configuration file\r\n"); + PrintStr(L"-help, -? display this help\r\n"); + blexit(NULL); + } + else + { + PrintStr(L"WARNING: Unknown command line option '"); + PrintStr(ptr); + PrintStr(L"' ignored\r\n"); + } } else - { - PrintStr(L"WARNING: Unknown command line option '"); - PrintStr(ptr); - PrintStr(L"' ignored\r\n"); - } + section.w = ptr; } - else - section.w = ptr; - } - if ( !base_video ) - { - unsigned int best; - - for ( i = 0, size = 0, best = StdOut->Mode->Mode; - i < StdOut->Mode->MaxMode; ++i ) + if ( !base_video ) { - if ( StdOut->QueryMode(StdOut, i, &cols, &rows) == EFI_SUCCESS && - cols * rows > size ) + unsigned int best; + UINTN cols, rows, size; + + for ( i = 0, size = 0, best = StdOut->Mode->Mode; + i < StdOut->Mode->MaxMode; ++i ) { - size = cols * rows; - best = i; + if ( StdOut->QueryMode(StdOut, i, &cols, &rows) == EFI_SUCCESS && + cols * rows > size ) + { + size = cols * rows; + best = i; + } } + if ( best != StdOut->Mode->Mode ) + StdOut->SetMode(StdOut, best); } - if ( best != StdOut->Mode->Mode ) - StdOut->SetMode(StdOut, best); } PrintStr(L"Xen " __stringify(XEN_VERSION) "." __stringify(XEN_SUBVERSION) @@ -793,37 +799,38 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) efi_arch_relocate_image(0); - if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, - &cols, &rows) == EFI_SUCCESS ) - efi_arch_console_init(cols, rows); - - size = 0; - status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, NULL); - if ( status == EFI_BUFFER_TOO_SMALL ) - status = efi_bs->AllocatePool(EfiLoaderData, size, (void **)&handles); - if ( !EFI_ERROR(status) ) - status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, - handles); - if ( EFI_ERROR(status) ) - size = 0; - for ( i = 0; i < size / sizeof(*handles); ++i ) - { - status = efi_bs->HandleProtocol(handles[i], &gop_guid, (void **)&gop); - if ( EFI_ERROR(status) ) - continue; - status = gop->QueryMode(gop, gop->Mode->Mode, &info_size, &mode_info); - if ( !EFI_ERROR(status) ) - break; - } - if ( handles ) - efi_bs->FreePool(handles); - if ( EFI_ERROR(status) ) - gop = NULL; - - cols = rows = depth = 0; - if ( efi_arch_use_config_file(SystemTable) ) + if ( use_cfg_file ) { EFI_FILE_HANDLE dir_handle; + UINTN depth, cols, rows, size; + + size = cols = rows = depth = 0; + + if ( StdOut->QueryMode(StdOut, StdOut->Mode->Mode, + &cols, &rows) == EFI_SUCCESS ) + efi_arch_console_init(cols, rows); + + status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, NULL); + if ( status == EFI_BUFFER_TOO_SMALL ) + status = efi_bs->AllocatePool(EfiLoaderData, size, (void **)&handles); + if ( !EFI_ERROR(status) ) + status = efi_bs->LocateHandle(ByProtocol, &gop_guid, NULL, &size, + handles); + if ( EFI_ERROR(status) ) + size = 0; + for ( i = 0; i < size / sizeof(*handles); ++i ) + { + status = efi_bs->HandleProtocol(handles[i], &gop_guid, (void **)&gop); + if ( EFI_ERROR(status) ) + continue; + status = gop->QueryMode(gop, gop->Mode->Mode, &info_size, &mode_info); + if ( !EFI_ERROR(status) ) + break; + } + if ( handles ) + efi_bs->FreePool(handles); + if ( EFI_ERROR(status) ) + gop = NULL; /* Get the file system interface. */ dir_handle = get_parent_handle(loaded_image, &file_name); @@ -931,45 +938,44 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) dir_handle->Close(dir_handle); - } - - if ( gop && !base_video ) - { - for ( i = size = 0; i < gop->Mode->MaxMode; ++i ) + if ( gop && !base_video ) { - unsigned int bpp = 0; - - status = gop->QueryMode(gop, i, &info_size, &mode_info); - if ( EFI_ERROR(status) ) - continue; - switch ( mode_info->PixelFormat ) - { - case PixelBitMask: - bpp = hweight32(mode_info->PixelInformation.RedMask | - mode_info->PixelInformation.GreenMask | - mode_info->PixelInformation.BlueMask); - break; - case PixelRedGreenBlueReserved8BitPerColor: - case PixelBlueGreenRedReserved8BitPerColor: - bpp = 24; - break; - default: - continue; - } - if ( cols == mode_info->HorizontalResolution && - rows == mode_info->VerticalResolution && - (!depth || bpp == depth) ) + for ( i = size = 0; i < gop->Mode->MaxMode; ++i ) { - gop_mode = i; - break; - } - if ( !cols && !rows && - mode_info->HorizontalResolution * - mode_info->VerticalResolution > size ) - { - size = mode_info->HorizontalResolution * - mode_info->VerticalResolution; - gop_mode = i; + unsigned int bpp = 0; + + status = gop->QueryMode(gop, i, &info_size, &mode_info); + if ( EFI_ERROR(status) ) + continue; + switch ( mode_info->PixelFormat ) + { + case PixelBitMask: + bpp = hweight32(mode_info->PixelInformation.RedMask | + mode_info->PixelInformation.GreenMask | + mode_info->PixelInformation.BlueMask); + break; + case PixelRedGreenBlueReserved8BitPerColor: + case PixelBlueGreenRedReserved8BitPerColor: + bpp = 24; + break; + default: + continue; + } + if ( cols == mode_info->HorizontalResolution && + rows == mode_info->VerticalResolution && + (!depth || bpp == depth) ) + { + gop_mode = i; + break; + } + if ( !cols && !rows && + mode_info->HorizontalResolution * + mode_info->VerticalResolution > size ) + { + size = mode_info->HorizontalResolution * + mode_info->VerticalResolution; + gop_mode = i; + } } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:23:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1XnowL-0004og-I5; Mon, 10 Nov 2014 13: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 1XnowK-0004oU-5R for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:28 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id A5/04-02699-F4CB0645; Mon, 10 Nov 2014 13:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1415625805!12474277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30802 invoked from network); 10 Nov 2014 13:23:26 -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; 10 Nov 2014 13:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowH-0004ao-Ku for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnowH-0001gE-Jq for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:25 +0000 Date: Mon, 10 Nov 2014 13:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: disable emulate.c REP optimization if introspection is active X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 413e9215ace59eb9d0dcbd00376e1029ec23c6ab Author: Razvan Cojocaru AuthorDate: Tue Nov 4 13:13:55 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:13:55 2014 +0100 x86: disable emulate.c REP optimization if introspection is active Emulation for REP instructions is optimized to perform a single write for all repeats in the current page if possible. However, this interferes with a memory introspection application's ability to detect suspect behaviour, since it will cause only one mem_event to be sent per page touched. This patch disables the optimization, gated on introspection being active for the domain. Signed-off-by: Razvan Cojocaru --- xen/arch/x86/hvm/emulate.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index c0f47d2..14c1847 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -406,8 +406,13 @@ static int hvmemul_virtual_to_linear( * Clip repetitions to avoid overflow when multiplying by @bytes_per_rep. * The chosen maximum is very conservative but it's what we use in * hvmemul_linear_to_phys() so there is no point in using a larger value. + * If introspection has been enabled for this domain, *reps should be + * at most 1, since optimization might otherwise cause a single mem_event + * being triggered for repeated writes to a whole page. */ - *reps = min_t(unsigned long, *reps, 4096); + *reps = min_t(unsigned long, *reps, + unlikely(current->domain->arch.hvm_domain.introspection_enabled) + ? 1 : 4096); reg = hvmemul_get_seg_reg(seg, hvmemul_ctxt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:23:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13: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 1XnowL-0004og-I5; Mon, 10 Nov 2014 13: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 1XnowK-0004oU-5R for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:28 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id A5/04-02699-F4CB0645; Mon, 10 Nov 2014 13:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1415625805!12474277!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30802 invoked from network); 10 Nov 2014 13:23:26 -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; 10 Nov 2014 13:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowH-0004ao-Ku for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnowH-0001gE-Jq for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:25 +0000 Date: Mon, 10 Nov 2014 13:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: disable emulate.c REP optimization if introspection is active X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 413e9215ace59eb9d0dcbd00376e1029ec23c6ab Author: Razvan Cojocaru AuthorDate: Tue Nov 4 13:13:55 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:13:55 2014 +0100 x86: disable emulate.c REP optimization if introspection is active Emulation for REP instructions is optimized to perform a single write for all repeats in the current page if possible. However, this interferes with a memory introspection application's ability to detect suspect behaviour, since it will cause only one mem_event to be sent per page touched. This patch disables the optimization, gated on introspection being active for the domain. Signed-off-by: Razvan Cojocaru --- xen/arch/x86/hvm/emulate.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index c0f47d2..14c1847 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -406,8 +406,13 @@ static int hvmemul_virtual_to_linear( * Clip repetitions to avoid overflow when multiplying by @bytes_per_rep. * The chosen maximum is very conservative but it's what we use in * hvmemul_linear_to_phys() so there is no point in using a larger value. + * If introspection has been enabled for this domain, *reps should be + * at most 1, since optimization might otherwise cause a single mem_event + * being triggered for repeated writes to a whole page. */ - *reps = min_t(unsigned long, *reps, 4096); + *reps = min_t(unsigned long, *reps, + unlikely(current->domain->arch.hvm_domain.introspection_enabled) + ? 1 : 4096); reg = hvmemul_get_seg_reg(seg, hvmemul_ctxt); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:23:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowV-0004qP-Ku; Mon, 10 Nov 2014 13:23:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowT-0004qC-S2 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:37 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id FA/D8-09936-95CB0645; Mon, 10 Nov 2014 13:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1415625815!12754119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19783 invoked from network); 10 Nov 2014 13:23:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:23:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowR-0004aw-QA for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnowR-0001h7-Ox for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:35 +0000 Date: Mon, 10 Nov 2014 13:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ... as being more like a hypervisor extension into the guest than a X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c8dd034f083dbc0cca2ba375a754978f8e25332 Author: Jan Beulich AuthorDate: Tue Nov 4 13:15:58 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:15:58 2014 +0100 ... as being more like a hypervisor extension into the guest than a part of the tool stack. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1be16db..ee2fe90 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -345,6 +345,7 @@ S: Supported L: xen-devel@lists.xen.org F: xen/arch/x86/ F: xen/include/asm-x86/ +F: tools/firmware/hvmloader/ X86 MEMORY MANAGEMENT M: Tim Deegan -- generated by git-patchbot for /home/xen/git/xen.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 10 13:23:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowV-0004qP-Ku; Mon, 10 Nov 2014 13:23:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowT-0004qC-S2 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:37 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id FA/D8-09936-95CB0645; Mon, 10 Nov 2014 13:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1415625815!12754119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19783 invoked from network); 10 Nov 2014 13:23:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:23:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnowR-0004aw-QA for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XnowR-0001h7-Ox for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:35 +0000 Date: Mon, 10 Nov 2014 13:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ... as being more like a hypervisor extension into the guest than a X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c8dd034f083dbc0cca2ba375a754978f8e25332 Author: Jan Beulich AuthorDate: Tue Nov 4 13:15:58 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 4 13:15:58 2014 +0100 ... as being more like a hypervisor extension into the guest than a part of the tool stack. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- MAINTAINERS | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1be16db..ee2fe90 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -345,6 +345,7 @@ S: Supported L: xen-devel@lists.xen.org F: xen/arch/x86/ F: xen/include/asm-x86/ +F: tools/firmware/hvmloader/ X86 MEMORY MANAGEMENT M: Tim Deegan -- generated by git-patchbot for /home/xen/git/xen.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 10 13:23:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowf-0004sB-PO; Mon, 10 Nov 2014 13:23:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowe-0004rw-Ls for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:48 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 83/29-09936-46CB0645; Mon, 10 Nov 2014 13:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1415625826!12730536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8124 invoked from network); 10 Nov 2014 13:23:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:23:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowb-0004b2-W3 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnowb-0001hW-Tg for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:45 +0000 Date: Mon, 10 Nov 2014 13:23:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentop: Dynamically expand some columns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1210f81cdf1b846091d8e6042923d68403cc53e2 Author: Markus Hauschild AuthorDate: Wed Oct 29 12:24:32 2014 +0100 Commit: Ian Campbell CommitDate: Wed Nov 5 10:09:29 2014 +0000 xentop: Dynamically expand some columns Allow certain xentop columns to automatically expand as the amount of data reported gets larger. The columns allowed to auto expand are: NETTX(k), NETRX(k), VBD_RD, VBD_WR, VBD_RSECT, VBD_WSECT If the -f option is used to allow full length VM names, those names will also be aligned based on the longest name in the NAME column. The default minimum width of all columns remains unchanged. Signed-off-by: Markus Hauschild Signed-off-by: Charles Arnold Acked-by: Ian Campbell --- tools/xenstat/xentop/Makefile | 2 +- tools/xenstat/xentop/xentop.c | 74 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 18bccb6..076e44c 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -19,7 +19,7 @@ all install xentop: else CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) -LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) +LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) -lm CFLAGS += -DHOST_$(XEN_OS) # Include configure output (config.h) to headers search path diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index dd11927..3062cb5 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -70,6 +71,8 @@ #define curses_str_t const char * #endif +#define INT_FIELD_WIDTH(n) ((unsigned int)(log10(n) + 1)) + /* * Function prototypes */ @@ -127,7 +130,8 @@ static int compare_vbd_rsect(xenstat_domain *domain1, xenstat_domain *domain2); static void print_vbd_rsect(xenstat_domain *domain); static int compare_vbd_wsect(xenstat_domain *domain1, xenstat_domain *domain2); static void print_vbd_wsect(xenstat_domain *domain); - +static void reset_field_widths(void); +static void adjust_field_widths(xenstat_domain *domain); /* Section printing functions */ static void do_summary(void); @@ -444,7 +448,7 @@ int compare_name(xenstat_domain *domain1, xenstat_domain *domain2) void print_name(xenstat_domain *domain) { if(show_full_name) - print("%10s", xenstat_domain_name(domain)); + print("%*s", fields[FIELD_NAME-1].default_width, xenstat_domain_name(domain)); else print("%10.10s", xenstat_domain_name(domain)); } @@ -623,7 +627,7 @@ static int compare_net_tx(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total network tx bytes statistic */ static void print_net_tx(xenstat_domain *domain) { - print("%8llu", tot_net_bytes(domain, FALSE)/1024); + print("%*llu", fields[FIELD_NET_TX-1].default_width, tot_net_bytes(domain, FALSE)/1024); } /* Compares number of total network rx bytes of two domains, returning -1,0,1 @@ -637,7 +641,7 @@ static int compare_net_rx(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total network rx bytes statistic */ static void print_net_rx(xenstat_domain *domain) { - print("%8llu", tot_net_bytes(domain, TRUE)/1024); + print("%*llu", fields[FIELD_NET_RX-1].default_width, tot_net_bytes(domain, TRUE)/1024); } /* Gets number of total network bytes statistic, if rx true, then rx bytes @@ -705,7 +709,7 @@ static int compare_vbd_rd(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD READ requests statistic */ static void print_vbd_rd(xenstat_domain *domain) { - print("%8llu", tot_vbd_reqs(domain, FIELD_VBD_RD)); + print("%*llu", fields[FIELD_VBD_RD-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_RD)); } /* Compares number of total VBD WRITE requests of two domains, @@ -719,7 +723,7 @@ static int compare_vbd_wr(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD WRITE requests statistic */ static void print_vbd_wr(xenstat_domain *domain) { - print("%8llu", tot_vbd_reqs(domain, FIELD_VBD_WR)); + print("%*llu", fields[FIELD_VBD_WR-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_WR)); } /* Compares number of total VBD READ sectors of two domains, @@ -733,7 +737,7 @@ static int compare_vbd_rsect(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD READ sectors statistic */ static void print_vbd_rsect(xenstat_domain *domain) { - print("%10llu", tot_vbd_reqs(domain, FIELD_VBD_RSECT)); + print("%*llu", fields[FIELD_VBD_RSECT-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_RSECT)); } /* Compares number of total VBD WRITE sectors of two domains, @@ -747,7 +751,7 @@ static int compare_vbd_wsect(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD WRITE sectors statistic */ static void print_vbd_wsect(xenstat_domain *domain) { - print("%10llu", tot_vbd_reqs(domain, FIELD_VBD_WSECT)); + print("%*llu", fields[FIELD_VBD_WSECT-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_WSECT)); } @@ -806,6 +810,54 @@ static void print_ssid(xenstat_domain *domain) print("%4u", xenstat_domain_ssid(domain)); } +/* Resets default_width for fields with potentially large numbers */ +void reset_field_widths(void) +{ + fields[FIELD_NET_TX-1].default_width = 8; + fields[FIELD_NET_RX-1].default_width = 8; + fields[FIELD_VBD_RD-1].default_width = 8; + fields[FIELD_VBD_WR-1].default_width = 8; + fields[FIELD_VBD_RSECT-1].default_width = 10; + fields[FIELD_VBD_WSECT-1].default_width = 10; +} + +/* Adjusts default_width for fields with potentially large numbers */ +void adjust_field_widths(xenstat_domain *domain) +{ + unsigned int length; + + if (show_full_name) { + length = strlen(xenstat_domain_name(domain)); + if (length > fields[FIELD_NAME-1].default_width) + fields[FIELD_NAME-1].default_width = length; + } + + length = INT_FIELD_WIDTH((tot_net_bytes(domain, FALSE)/1024) + 1); + if (length > fields[FIELD_NET_TX-1].default_width) + fields[FIELD_NET_TX-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_net_bytes(domain, TRUE)/1024) + 1); + if (length > fields[FIELD_NET_RX-1].default_width) + fields[FIELD_NET_RX-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_RD)) + 1); + if (length > fields[FIELD_VBD_RD-1].default_width) + fields[FIELD_VBD_RD-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_WR)) + 1); + if (length > fields[FIELD_VBD_WR-1].default_width) + fields[FIELD_VBD_WR-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_RSECT)) + 1); + if (length > fields[FIELD_VBD_RSECT-1].default_width) + fields[FIELD_VBD_RSECT-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_WSECT)) + 1); + if (length > fields[FIELD_VBD_WSECT-1].default_width) + fields[FIELD_VBD_WSECT-1].default_width = length; +} + + /* Section printing functions */ /* Prints the top summary, above the domain table */ void do_summary(void) @@ -1088,6 +1140,12 @@ static void top(void) if(first_domain_index >= num_domains) first_domain_index = num_domains-1; + /* Adjust default_width for fields with potentially large numbers */ + reset_field_widths(); + for (i = first_domain_index; i < num_domains; i++) { + adjust_field_widths(domains[i]); + } + for (i = first_domain_index; i < num_domains; i++) { if(!batch && current_row() == lines()-1) break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:23:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowf-0004sB-PO; Mon, 10 Nov 2014 13:23:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowe-0004rw-Ls for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:48 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 83/29-09936-46CB0645; Mon, 10 Nov 2014 13:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1415625826!12730536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8124 invoked from network); 10 Nov 2014 13:23:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:23:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowb-0004b2-W3 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnowb-0001hW-Tg for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:45 +0000 Date: Mon, 10 Nov 2014 13:23:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xentop: Dynamically expand some columns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1210f81cdf1b846091d8e6042923d68403cc53e2 Author: Markus Hauschild AuthorDate: Wed Oct 29 12:24:32 2014 +0100 Commit: Ian Campbell CommitDate: Wed Nov 5 10:09:29 2014 +0000 xentop: Dynamically expand some columns Allow certain xentop columns to automatically expand as the amount of data reported gets larger. The columns allowed to auto expand are: NETTX(k), NETRX(k), VBD_RD, VBD_WR, VBD_RSECT, VBD_WSECT If the -f option is used to allow full length VM names, those names will also be aligned based on the longest name in the NAME column. The default minimum width of all columns remains unchanged. Signed-off-by: Markus Hauschild Signed-off-by: Charles Arnold Acked-by: Ian Campbell --- tools/xenstat/xentop/Makefile | 2 +- tools/xenstat/xentop/xentop.c | 74 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index 18bccb6..076e44c 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -19,7 +19,7 @@ all install xentop: else CFLAGS += -DGCC_PRINTF -Werror $(CFLAGS_libxenstat) -LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) +LDLIBS += $(LDLIBS_libxenstat) $(CURSES_LIBS) $(SOCKET_LIBS) -lm CFLAGS += -DHOST_$(XEN_OS) # Include configure output (config.h) to headers search path diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index dd11927..3062cb5 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -70,6 +71,8 @@ #define curses_str_t const char * #endif +#define INT_FIELD_WIDTH(n) ((unsigned int)(log10(n) + 1)) + /* * Function prototypes */ @@ -127,7 +130,8 @@ static int compare_vbd_rsect(xenstat_domain *domain1, xenstat_domain *domain2); static void print_vbd_rsect(xenstat_domain *domain); static int compare_vbd_wsect(xenstat_domain *domain1, xenstat_domain *domain2); static void print_vbd_wsect(xenstat_domain *domain); - +static void reset_field_widths(void); +static void adjust_field_widths(xenstat_domain *domain); /* Section printing functions */ static void do_summary(void); @@ -444,7 +448,7 @@ int compare_name(xenstat_domain *domain1, xenstat_domain *domain2) void print_name(xenstat_domain *domain) { if(show_full_name) - print("%10s", xenstat_domain_name(domain)); + print("%*s", fields[FIELD_NAME-1].default_width, xenstat_domain_name(domain)); else print("%10.10s", xenstat_domain_name(domain)); } @@ -623,7 +627,7 @@ static int compare_net_tx(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total network tx bytes statistic */ static void print_net_tx(xenstat_domain *domain) { - print("%8llu", tot_net_bytes(domain, FALSE)/1024); + print("%*llu", fields[FIELD_NET_TX-1].default_width, tot_net_bytes(domain, FALSE)/1024); } /* Compares number of total network rx bytes of two domains, returning -1,0,1 @@ -637,7 +641,7 @@ static int compare_net_rx(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total network rx bytes statistic */ static void print_net_rx(xenstat_domain *domain) { - print("%8llu", tot_net_bytes(domain, TRUE)/1024); + print("%*llu", fields[FIELD_NET_RX-1].default_width, tot_net_bytes(domain, TRUE)/1024); } /* Gets number of total network bytes statistic, if rx true, then rx bytes @@ -705,7 +709,7 @@ static int compare_vbd_rd(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD READ requests statistic */ static void print_vbd_rd(xenstat_domain *domain) { - print("%8llu", tot_vbd_reqs(domain, FIELD_VBD_RD)); + print("%*llu", fields[FIELD_VBD_RD-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_RD)); } /* Compares number of total VBD WRITE requests of two domains, @@ -719,7 +723,7 @@ static int compare_vbd_wr(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD WRITE requests statistic */ static void print_vbd_wr(xenstat_domain *domain) { - print("%8llu", tot_vbd_reqs(domain, FIELD_VBD_WR)); + print("%*llu", fields[FIELD_VBD_WR-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_WR)); } /* Compares number of total VBD READ sectors of two domains, @@ -733,7 +737,7 @@ static int compare_vbd_rsect(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD READ sectors statistic */ static void print_vbd_rsect(xenstat_domain *domain) { - print("%10llu", tot_vbd_reqs(domain, FIELD_VBD_RSECT)); + print("%*llu", fields[FIELD_VBD_RSECT-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_RSECT)); } /* Compares number of total VBD WRITE sectors of two domains, @@ -747,7 +751,7 @@ static int compare_vbd_wsect(xenstat_domain *domain1, xenstat_domain *domain2) /* Prints number of total VBD WRITE sectors statistic */ static void print_vbd_wsect(xenstat_domain *domain) { - print("%10llu", tot_vbd_reqs(domain, FIELD_VBD_WSECT)); + print("%*llu", fields[FIELD_VBD_WSECT-1].default_width, tot_vbd_reqs(domain, FIELD_VBD_WSECT)); } @@ -806,6 +810,54 @@ static void print_ssid(xenstat_domain *domain) print("%4u", xenstat_domain_ssid(domain)); } +/* Resets default_width for fields with potentially large numbers */ +void reset_field_widths(void) +{ + fields[FIELD_NET_TX-1].default_width = 8; + fields[FIELD_NET_RX-1].default_width = 8; + fields[FIELD_VBD_RD-1].default_width = 8; + fields[FIELD_VBD_WR-1].default_width = 8; + fields[FIELD_VBD_RSECT-1].default_width = 10; + fields[FIELD_VBD_WSECT-1].default_width = 10; +} + +/* Adjusts default_width for fields with potentially large numbers */ +void adjust_field_widths(xenstat_domain *domain) +{ + unsigned int length; + + if (show_full_name) { + length = strlen(xenstat_domain_name(domain)); + if (length > fields[FIELD_NAME-1].default_width) + fields[FIELD_NAME-1].default_width = length; + } + + length = INT_FIELD_WIDTH((tot_net_bytes(domain, FALSE)/1024) + 1); + if (length > fields[FIELD_NET_TX-1].default_width) + fields[FIELD_NET_TX-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_net_bytes(domain, TRUE)/1024) + 1); + if (length > fields[FIELD_NET_RX-1].default_width) + fields[FIELD_NET_RX-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_RD)) + 1); + if (length > fields[FIELD_VBD_RD-1].default_width) + fields[FIELD_VBD_RD-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_WR)) + 1); + if (length > fields[FIELD_VBD_WR-1].default_width) + fields[FIELD_VBD_WR-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_RSECT)) + 1); + if (length > fields[FIELD_VBD_RSECT-1].default_width) + fields[FIELD_VBD_RSECT-1].default_width = length; + + length = INT_FIELD_WIDTH((tot_vbd_reqs(domain, FIELD_VBD_WSECT)) + 1); + if (length > fields[FIELD_VBD_WSECT-1].default_width) + fields[FIELD_VBD_WSECT-1].default_width = length; +} + + /* Section printing functions */ /* Prints the top summary, above the domain table */ void do_summary(void) @@ -1088,6 +1140,12 @@ static void top(void) if(first_domain_index >= num_domains) first_domain_index = num_domains-1; + /* Adjust default_width for fields with potentially large numbers */ + reset_field_widths(); + for (i = first_domain_index; i < num_domains; i++) { + adjust_field_widths(domains[i]); + } + for (i = first_domain_index; i < num_domains; i++) { if(!batch && current_row() == lines()-1) break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 10 13:23:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23: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 1Xnowo-0004u3-U1; Mon, 10 Nov 2014 13:23:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowo-0004tt-Em for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:58 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 15/79-09936-D6CB0645; Mon, 10 Nov 2014 13:23:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1415625836!12722146!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9292 invoked from network); 10 Nov 2014 13:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowm-0004bB-4Z for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnowm-0001i4-33 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:56 +0000 Date: Mon, 10 Nov 2014 13:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: configure correct dom0_gnttab_start/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 37f29b0cb2551b1d790015be81232b6202a43bf2 Author: Ian Campbell AuthorDate: Thu Sep 11 16:21:29 2014 +0100 Commit: Ian Campbell CommitDate: Wed Nov 5 10:10:22 2014 +0000 xen: arm: configure correct dom0_gnttab_start/size Vexpress is currently failing to boot for me with: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at arch/arm/mm/ioremap.c:301 __arm_ioremap_pfn_caller+0x118/0x1a4() CPU: 0 PID: 1 Comm: swapper Tainted: G W 3.16.0-arm-native+ #276 [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (warn_slowpath_common+0x5c/0x7c) [] (warn_slowpath_common) from [] (warn_slowpath_null+0x18/0x20) [] (warn_slowpath_null) from [] (__arm_ioremap_pfn_caller+0x118/0x1a4) [] (__arm_ioremap_pfn_caller) from [] (__arm_ioremap+0x14/0x20) [] (__arm_ioremap) from [] (gnttab_setup_auto_xlat_frames+0x30/0xdc) [] (gnttab_setup_auto_xlat_frames) from [] (xen_guest_init+0x19c/0x2d4) [] (xen_guest_init) from [] (do_one_initcall+0xfc/0x1a4) [] (do_one_initcall) from [] (kernel_init_freeable+0x58/0x1b4) [] (kernel_init_freeable) from [] (kernel_init+0x8/0xe4) [] (kernel_init) from [] (ret_from_fork+0x14/0x3c) ---[ end trace 3406ff24bd97382f ]--- xen:grant_table: Failed to ioremap gnttab share frames (addr=0x00000000b0000000)! which is: /* * Don't allow RAM to be mapped - this causes problems with ARMv6+ */ if (WARN_ON(pfn_valid(pfn))) return NULL; This makes sense since the gnttab defaults to 0xb000000 and my dom0 is being allocated a 1:1 mapping at 0xa0000000-0xc0000000. I suspect this broke around the time we stopped forcing dom0 memory to be allocated as low as possible which happened to prevent the default dom0_gnttab region overlapping RAM. This patch specifies an explicit dom0_gnttab base which is explicitly unused according to the FVP model docs (although it corresponds to CS5 this isn't wired up to anything). Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/vexpress.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 8e6a4ea..ce66935 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -176,6 +176,8 @@ PLATFORM_START(vexpress, "VERSATILE EXPRESS") #endif .reset = vexpress_reset, .blacklist_dev = vexpress_blacklist_dev, + .dom0_gnttab_start = 0x10000000, + .dom0_gnttab_size = 0x20000, 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 Mon Nov 10 13:23:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:23: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 1Xnowo-0004u3-U1; Mon, 10 Nov 2014 13:23:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowo-0004tt-Em for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:58 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 15/79-09936-D6CB0645; Mon, 10 Nov 2014 13:23:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1415625836!12722146!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9292 invoked from network); 10 Nov 2014 13:23:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowm-0004bB-4Z for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnowm-0001i4-33 for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:23:56 +0000 Date: Mon, 10 Nov 2014 13:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: configure correct dom0_gnttab_start/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 37f29b0cb2551b1d790015be81232b6202a43bf2 Author: Ian Campbell AuthorDate: Thu Sep 11 16:21:29 2014 +0100 Commit: Ian Campbell CommitDate: Wed Nov 5 10:10:22 2014 +0000 xen: arm: configure correct dom0_gnttab_start/size Vexpress is currently failing to boot for me with: ------------[ cut here ]------------ WARNING: CPU: 0 PID: 1 at arch/arm/mm/ioremap.c:301 __arm_ioremap_pfn_caller+0x118/0x1a4() CPU: 0 PID: 1 Comm: swapper Tainted: G W 3.16.0-arm-native+ #276 [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (warn_slowpath_common+0x5c/0x7c) [] (warn_slowpath_common) from [] (warn_slowpath_null+0x18/0x20) [] (warn_slowpath_null) from [] (__arm_ioremap_pfn_caller+0x118/0x1a4) [] (__arm_ioremap_pfn_caller) from [] (__arm_ioremap+0x14/0x20) [] (__arm_ioremap) from [] (gnttab_setup_auto_xlat_frames+0x30/0xdc) [] (gnttab_setup_auto_xlat_frames) from [] (xen_guest_init+0x19c/0x2d4) [] (xen_guest_init) from [] (do_one_initcall+0xfc/0x1a4) [] (do_one_initcall) from [] (kernel_init_freeable+0x58/0x1b4) [] (kernel_init_freeable) from [] (kernel_init+0x8/0xe4) [] (kernel_init) from [] (ret_from_fork+0x14/0x3c) ---[ end trace 3406ff24bd97382f ]--- xen:grant_table: Failed to ioremap gnttab share frames (addr=0x00000000b0000000)! which is: /* * Don't allow RAM to be mapped - this causes problems with ARMv6+ */ if (WARN_ON(pfn_valid(pfn))) return NULL; This makes sense since the gnttab defaults to 0xb000000 and my dom0 is being allocated a 1:1 mapping at 0xa0000000-0xc0000000. I suspect this broke around the time we stopped forcing dom0 memory to be allocated as low as possible which happened to prevent the default dom0_gnttab region overlapping RAM. This patch specifies an explicit dom0_gnttab base which is explicitly unused according to the FVP model docs (although it corresponds to CS5 this isn't wired up to anything). Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/vexpress.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/platforms/vexpress.c b/xen/arch/arm/platforms/vexpress.c index 8e6a4ea..ce66935 100644 --- a/xen/arch/arm/platforms/vexpress.c +++ b/xen/arch/arm/platforms/vexpress.c @@ -176,6 +176,8 @@ PLATFORM_START(vexpress, "VERSATILE EXPRESS") #endif .reset = vexpress_reset, .blacklist_dev = vexpress_blacklist_dev, + .dom0_gnttab_start = 0x10000000, + .dom0_gnttab_size = 0x20000, 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 Mon Nov 10 13:24:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:24:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowz-0004vZ-0S; Mon, 10 Nov 2014 13:24:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowy-0004vI-De for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:24:08 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 44/3A-24532-77CB0645; Mon, 10 Nov 2014 13:24:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1415625846!12383566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1355 invoked from network); 10 Nov 2014 13:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnoww-0004bk-AY for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnoww-0001ig-8i for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:24:06 +0000 Date: Mon, 10 Nov 2014 13:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: propagate gic's #address-cells property to dom0. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 816f5bb1f0740be8355e1be6cc24edf09547d984 Author: Ian Campbell AuthorDate: Fri Oct 24 10:58:33 2014 +0100 Commit: Ian Campbell CommitDate: Wed Nov 5 10:11:13 2014 +0000 xen: arm: propagate gic's #address-cells property to dom0. The interrupt-map property requires that the interrupt-parent node must have both #address-cells and #interrupt-cells properties (see ePAPR 2.4.3.1). Therefore propagate the property if it is present. We must propagate (rather than invent our own value) since this value is used to size fields within other properties within the tree. ePAPR strictly speaking requires that the interrupt-parent node always has these properties. However reality has diverged from this and implementations will recursively search parents for #*-cells properties. Hence we only copy if it is present. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- 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 5aca925..de180d8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -788,6 +788,8 @@ static int make_gic_node(const struct domain *d, void *fdt, { const struct dt_device_node *gic = dt_interrupt_controller; int res = 0; + const void *addrcells; + u32 addrcells_len; /* * Xen currently supports only a single GIC. Discard any secondary @@ -817,6 +819,14 @@ static int make_gic_node(const struct domain *d, void *fdt, return res; } + addrcells = dt_get_property(gic, "#address-cells", &addrcells_len); + if ( addrcells ) + { + res = fdt_property(fdt, "#address-cells", addrcells, addrcells_len); + if ( res ) + return res; + } + res = fdt_end_node(fdt); 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 Mon Nov 10 13:24:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 10 Nov 2014 13:24:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowz-0004vZ-0S; Mon, 10 Nov 2014 13:24:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnowy-0004vI-De for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:24:08 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 44/3A-24532-77CB0645; Mon, 10 Nov 2014 13:24:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1415625846!12383566!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1355 invoked from network); 10 Nov 2014 13:24:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Nov 2014 13:24:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xnoww-0004bk-AY for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xnoww-0001ig-8i for xen-changelog@lists.xensource.com; Mon, 10 Nov 2014 13:24:06 +0000 Date: Mon, 10 Nov 2014 13:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: propagate gic's #address-cells property to dom0. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 816f5bb1f0740be8355e1be6cc24edf09547d984 Author: Ian Campbell AuthorDate: Fri Oct 24 10:58:33 2014 +0100 Commit: Ian Campbell CommitDate: Wed Nov 5 10:11:13 2014 +0000 xen: arm: propagate gic's #address-cells property to dom0. The interrupt-map property requires that the interrupt-parent node must have both #address-cells and #interrupt-cells properties (see ePAPR 2.4.3.1). Therefore propagate the property if it is present. We must propagate (rather than invent our own value) since this value is used to size fields within other properties within the tree. ePAPR strictly speaking requires that the interrupt-parent node always has these properties. However reality has diverged from this and implementations will recursively search parents for #*-cells properties. Hence we only copy if it is present. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- 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 5aca925..de180d8 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -788,6 +788,8 @@ static int make_gic_node(const struct domain *d, void *fdt, { const struct dt_device_node *gic = dt_interrupt_controller; int res = 0; + const void *addrcells; + u32 addrcells_len; /* * Xen currently supports only a single GIC. Discard any secondary @@ -817,6 +819,14 @@ static int make_gic_node(const struct domain *d, void *fdt, return res; } + addrcells = dt_get_property(gic, "#address-cells", &addrcells_len); + if ( addrcells ) + { + res = fdt_property(fdt, "#address-cells", addrcells, addrcells_len); + if ( res ) + return res; + } + res = fdt_end_node(fdt); 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 11 08:00:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08:00:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6My-00056w-Tf; Tue, 11 Nov 2014 08:00:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6Mw-00052D-Pv for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:06 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 3E/93-09936-602C1645; Tue, 11 Nov 2014 08:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1415692804!8369565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8217 invoked from network); 11 Nov 2014 08:00: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; 11 Nov 2014 08:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6Mt-0007vP-Nj for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6Mt-00026V-IZ for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:03 +0000 Date: Tue, 11 Nov 2014 08:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: do not leak diskpath during local disk attach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 379b351889a8f02abe30a06e2ce9ba8b381b91ab Author: Ian Campbell AuthorDate: Thu Nov 6 13:00:31 2014 +0000 Commit: Ian Jackson CommitDate: Thu Nov 6 16:30:47 2014 +0000 tools: libxl: do not leak diskpath during local disk attach libxl__device_disk_local_initiate_attach is assigning dls->diskpath with a strdup of the device path. This is then passed to the callback, e.g. parse_bootloader_result but bootloader_cleanup will not free it. Since the callback is within the scope of the (e)gc and therefore doesn't need to be malloc'd, a gc'd alloc will do. All other assignments to this field use the gc. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767295 Reported-by: Gedalya Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7e7d1df..f7961f6 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3030,7 +3030,7 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc, } if (dev != NULL) - dls->diskpath = strdup(dev); + dls->diskpath = libxl__strdup(gc, dev); dls->callback(egc, dls, 0); 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 11 08:00:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08:00:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6My-00056w-Tf; Tue, 11 Nov 2014 08:00:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6Mw-00052D-Pv for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:06 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 3E/93-09936-602C1645; Tue, 11 Nov 2014 08:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1415692804!8369565!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8217 invoked from network); 11 Nov 2014 08:00: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; 11 Nov 2014 08:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6Mt-0007vP-Nj for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6Mt-00026V-IZ for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:03 +0000 Date: Tue, 11 Nov 2014 08:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: do not leak diskpath during local disk attach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 379b351889a8f02abe30a06e2ce9ba8b381b91ab Author: Ian Campbell AuthorDate: Thu Nov 6 13:00:31 2014 +0000 Commit: Ian Jackson CommitDate: Thu Nov 6 16:30:47 2014 +0000 tools: libxl: do not leak diskpath during local disk attach libxl__device_disk_local_initiate_attach is assigning dls->diskpath with a strdup of the device path. This is then passed to the callback, e.g. parse_bootloader_result but bootloader_cleanup will not free it. Since the callback is within the scope of the (e)gc and therefore doesn't need to be malloc'd, a gc'd alloc will do. All other assignments to this field use the gc. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=767295 Reported-by: Gedalya Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 7e7d1df..f7961f6 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3030,7 +3030,7 @@ void libxl__device_disk_local_initiate_attach(libxl__egc *egc, } if (dev != NULL) - dls->diskpath = strdup(dev); + dls->diskpath = libxl__strdup(gc, dev); dls->callback(egc, dls, 0); 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 11 08:00:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08: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 1Xo6N7-000590-U6; Tue, 11 Nov 2014 08:00:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6N6-00058g-0U for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:16 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 3E/2C-24532-F02C1645; Tue, 11 Nov 2014 08:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1415692814!11822789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9572 invoked from network); 11 Nov 2014 08:00:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2014 08:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6N3-00086G-US for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6N3-000281-TB for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:13 +0000 Date: Tue, 11 Nov 2014 08:00:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: do not overrun input buffer in libxl__parse_mac X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a430eca0b27354456d1245ed3f637d5f2e17883 Author: Ian Campbell AuthorDate: Thu Nov 6 13:59:43 2014 +0000 Commit: Ian Jackson CommitDate: Thu Nov 6 16:32:11 2014 +0000 tools: libxl: do not overrun input buffer in libxl__parse_mac Valgrind reports: ==7971== Invalid read of size 1 ==7971== at 0x40877BE: libxl__parse_mac (libxl_internal.c:288) ==7971== by 0x405C5F8: libxl__device_nic_from_xs_be (libxl.c:3405) ==7971== by 0x4065542: libxl__append_nic_list_of_type (libxl.c:3484) ==7971== by 0x4065542: libxl_device_nic_list (libxl.c:3504) ==7971== by 0x406F561: libxl_retrieve_domain_configuration (libxl.c:6661) ==7971== by 0x805671C: reload_domain_config (xl_cmdimpl.c:2037) ==7971== by 0x8057F30: handle_domain_death (xl_cmdimpl.c:2116) ==7971== by 0x8057F30: create_domain (xl_cmdimpl.c:2580) ==7971== by 0x805B4B2: main_create (xl_cmdimpl.c:4652) ==7971== by 0x804EAB2: main (xl.c:378) This is because on the final iteration the tok += 3 skips over the terminating NUL to the next byte, and then *tok reads it. Fix this by using endptr as the iterator. Signed-off-by: Ian Campbell Reviewed-by: Don Slutz Acked-by: Wei Liu --- tools/libxl/libxl_internal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 02a71cb..00c3b1e 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -284,10 +284,12 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac) char *endptr; int i; - for (i = 0, tok = s; *tok && (i < 6); ++i, tok += 3) { + for (i = 0, tok = s; *tok && (i < 6); ++i, tok = endptr) { mac[i] = strtol(tok, &endptr, 16); if (endptr != (tok + 2) || (*endptr != '\0' && *endptr != ':') ) return ERROR_INVAL; + if (*endptr == ':') + endptr++; } if ( i != 6 ) return ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.git#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 11 08:00:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08: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 1Xo6N7-000590-U6; Tue, 11 Nov 2014 08:00:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6N6-00058g-0U for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:16 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 3E/2C-24532-F02C1645; Tue, 11 Nov 2014 08:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1415692814!11822789!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9572 invoked from network); 11 Nov 2014 08:00:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2014 08:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6N3-00086G-US for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6N3-000281-TB for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:13 +0000 Date: Tue, 11 Nov 2014 08:00:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: do not overrun input buffer in libxl__parse_mac X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a430eca0b27354456d1245ed3f637d5f2e17883 Author: Ian Campbell AuthorDate: Thu Nov 6 13:59:43 2014 +0000 Commit: Ian Jackson CommitDate: Thu Nov 6 16:32:11 2014 +0000 tools: libxl: do not overrun input buffer in libxl__parse_mac Valgrind reports: ==7971== Invalid read of size 1 ==7971== at 0x40877BE: libxl__parse_mac (libxl_internal.c:288) ==7971== by 0x405C5F8: libxl__device_nic_from_xs_be (libxl.c:3405) ==7971== by 0x4065542: libxl__append_nic_list_of_type (libxl.c:3484) ==7971== by 0x4065542: libxl_device_nic_list (libxl.c:3504) ==7971== by 0x406F561: libxl_retrieve_domain_configuration (libxl.c:6661) ==7971== by 0x805671C: reload_domain_config (xl_cmdimpl.c:2037) ==7971== by 0x8057F30: handle_domain_death (xl_cmdimpl.c:2116) ==7971== by 0x8057F30: create_domain (xl_cmdimpl.c:2580) ==7971== by 0x805B4B2: main_create (xl_cmdimpl.c:4652) ==7971== by 0x804EAB2: main (xl.c:378) This is because on the final iteration the tok += 3 skips over the terminating NUL to the next byte, and then *tok reads it. Fix this by using endptr as the iterator. Signed-off-by: Ian Campbell Reviewed-by: Don Slutz Acked-by: Wei Liu --- tools/libxl/libxl_internal.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 02a71cb..00c3b1e 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -284,10 +284,12 @@ _hidden int libxl__parse_mac(const char *s, libxl_mac mac) char *endptr; int i; - for (i = 0, tok = s; *tok && (i < 6); ++i, tok += 3) { + for (i = 0, tok = s; *tok && (i < 6); ++i, tok = endptr) { mac[i] = strtol(tok, &endptr, 16); if (endptr != (tok + 2) || (*endptr != '\0' && *endptr != ':') ) return ERROR_INVAL; + if (*endptr == ':') + endptr++; } if ( i != 6 ) return ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.git#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 11 08:00:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08: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 1Xo6NI-0005AT-QY; Tue, 11 Nov 2014 08:00:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NH-0005A7-AV for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:27 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id D2/14-26740-A12C1645; Tue, 11 Nov 2014 08:00:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1415692824!11603264!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.5 required=7.0 tests=BODY_RANDOM_LONG,LONGWORDS X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26876 invoked from network); 11 Nov 2014 08:00:25 -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; 11 Nov 2014 08:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NE-000878-4b for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6NE-00029X-2g for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:24 +0000 Date: Tue, 11 Nov 2014 08:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for GICv3 for domU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fda1614e1e95e7ecdfa97ea0afb80597ef8dbbc7 Author: Julien Grall AuthorDate: Wed Nov 5 13:04:22 2014 +0000 Commit: Ian Campbell CommitDate: Mon Nov 10 12:03:35 2014 +0000 xen/arm: Add support for GICv3 for domU The vGIC will emulate the same version as the hardware. The toolstack has to retrieve the version of the vGIC in order to be able to create the corresponding device tree node. A new DOMCTL has been introduced for ARM to configure the domain. For now it only allow the toolstack to retrieve the version of vGIC. This DOMCTL will be extend later to let the user choose the version of the emulated GIC. Signed-off-by: Vijaya Kumar K Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Jan Beulich Acked-by: Daniel De Graaf Cc: Wei Liu Acked-by: Ian Campbell --- tools/flask/policy/policy/modules/xen/xen.if | 2 +- tools/libxc/include/xenctrl.h | 6 ++ tools/libxc/xc_domain.c | 20 ++++++ tools/libxl/libxl_arm.c | 95 ++++++++++++++++++++++++-- xen/arch/arm/domctl.c | 35 ++++++++++ xen/arch/arm/gic-v3.c | 16 ++++- xen/include/public/arch-arm.h | 16 ++++ xen/include/public/domctl.h | 17 +++++ xen/xsm/flask/hooks.c | 3 + xen/xsm/flask/policy/access_vectors | 2 + 10 files changed, 204 insertions(+), 8 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index 641c797..fa69c9d 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -49,7 +49,7 @@ define(`create_domain_common', ` getdomaininfo hypercall setvcpucontext setextvcpucontext getscheduler getvcpuinfo getvcpuextstate getaddrsize getaffinity setaffinity }; - allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op }; + allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op configure_domain }; allow $1 $2:security check_context; allow $1 $2:shadow enable; allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op }; diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 564e187..45e282c 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -483,6 +483,12 @@ int xc_domain_create(xc_interface *xch, uint32_t flags, uint32_t *pdomid); +#if defined(__arm__) || defined(__aarch64__) +typedef xen_domctl_arm_configuredomain_t xc_domain_configuration_t; + +int xc_domain_configure(xc_interface *xch, uint32_t domid, + xc_domain_configuration_t *config); +#endif /* Functions to produce a dump of a given domain * xc_domain_dumpcore - produces a dump to a specified file diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index a9bcd4a..b071dea 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -48,6 +48,26 @@ int xc_domain_create(xc_interface *xch, return 0; } +#if defined(__arm__) || defined(__aarch64__) +int xc_domain_configure(xc_interface *xch, uint32_t domid, + xc_domain_configuration_t *config) +{ + int rc; + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_arm_configure_domain; + domctl.domain = (domid_t)domid; + /* xc_domain_configure_t is an alias of xen_domctl_arm_configuredomain */ + memcpy(&domctl.u.configuredomain, config, sizeof(*config)); + + rc = do_domctl(xch, &domctl); + if ( !rc ) + memcpy(config, &domctl.u.configuredomain, sizeof(*config)); + + return rc; +} +#endif + int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, xen_pfn_t start_pfn, xen_pfn_t nr_pfns) { diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index a122e4a..448ac07 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -23,6 +23,18 @@ #define DT_IRQ_TYPE_LEVEL_HIGH 0x00000004 #define DT_IRQ_TYPE_LEVEL_LOW 0x00000008 +static const char *gicv_to_string(uint8_t gic_version) +{ + switch (gic_version) { + case XEN_DOMCTL_CONFIG_GIC_V2: + return "V2"; + case XEN_DOMCTL_CONFIG_GIC_V3: + return "V3"; + default: + return "unknown"; + } +} + int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid) { @@ -307,9 +319,9 @@ static int make_memory_nodes(libxl__gc *gc, void *fdt, return 0; } -static int make_intc_node(libxl__gc *gc, void *fdt, - uint64_t gicd_base, uint64_t gicd_size, - uint64_t gicc_base, uint64_t gicc_size) +static int make_gicv2_node(libxl__gc *gc, void *fdt, + uint64_t gicd_base, uint64_t gicd_size, + uint64_t gicc_base, uint64_t gicc_size) { int res; const char *name = GCSPRINTF("interrupt-controller@%"PRIx64, gicd_base); @@ -350,6 +362,56 @@ static int make_intc_node(libxl__gc *gc, void *fdt, return 0; } +static int make_gicv3_node(libxl__gc *gc, void *fdt) +{ + int res; + const uint64_t gicd_base = GUEST_GICV3_GICD_BASE; + const uint64_t gicd_size = GUEST_GICV3_GICD_SIZE; + const uint64_t gicr0_base = GUEST_GICV3_GICR0_BASE; + const uint64_t gicr0_size = GUEST_GICV3_GICR0_SIZE; + const char *name = GCSPRINTF("interrupt-controller@%"PRIx64, gicd_base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "arm,gic-v3"); + 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_cell(fdt, "redistributor-stride", + GUEST_GICV3_RDIST_STRIDE); + if (res) return res; + + res = fdt_property_cell(fdt, "#redistributor-regions", + GUEST_GICV3_RDIST_REGIONS); + if (res) return res; + + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 2, + gicd_base, gicd_size, + gicr0_base, gicr0_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; @@ -456,6 +518,7 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, libxl_domain_build_info *info, struct xc_dom_image *dom) { + xc_domain_configuration_t config; void *fdt = NULL; int rc, res; size_t fdt_size = 0; @@ -471,8 +534,16 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, ainfo = get_arch_info(gc, dom); if (ainfo == NULL) return ERROR_FAIL; + LOG(DEBUG, "configure the domain"); + config.gic_version = XEN_DOMCTL_CONFIG_GIC_DEFAULT; + if (xc_domain_configure(CTX->xch, dom->guest_domid, &config) != 0) { + LOG(ERROR, "couldn't configure the domain"); + return ERROR_FAIL; + } + LOG(DEBUG, "constructing DTB for Xen version %d.%d guest", vers->xen_version_major, vers->xen_version_minor); + LOG(DEBUG, " - vGIC version: %s", gicv_to_string(config.gic_version)); /* * Call "call" handling FDR_ERR_*. Will either: @@ -520,9 +591,21 @@ next_resize: FDT( make_psci_node(gc, fdt) ); FDT( make_memory_nodes(gc, fdt, dom) ); - FDT( make_intc_node(gc, fdt, - GUEST_GICD_BASE, GUEST_GICD_SIZE, - GUEST_GICC_BASE, GUEST_GICD_SIZE) ); + + switch (config.gic_version) { + case XEN_DOMCTL_CONFIG_GIC_V2: + FDT( make_gicv2_node(gc, fdt, + GUEST_GICD_BASE, GUEST_GICD_SIZE, + GUEST_GICC_BASE, GUEST_GICC_SIZE) ); + break; + case XEN_DOMCTL_CONFIG_GIC_V3: + FDT( make_gicv3_node(gc, fdt) ); + break; + default: + LOG(ERROR, "Unknown GIC version %d", config.gic_version); + rc = ERROR_FAIL; + goto out; + } FDT( make_timer_node(gc, fdt, ainfo) ); FDT( make_hypervisor_node(gc, fdt, vers) ); diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 45974e7..d246e84 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, @@ -30,6 +32,39 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, return p2m_cache_flush(d, s, e); } + case XEN_DOMCTL_arm_configure_domain: + { + uint8_t gic_version; + + /* + * Currently the vGIC is emulating the same version of the + * hardware GIC. Only the value XEN_DOMCTL_CONFIG_GIC_DEFAULT + * is allowed. The DOMCTL will return the actual version of the + * GIC. + */ + if ( domctl->u.configuredomain.gic_version != XEN_DOMCTL_CONFIG_GIC_DEFAULT ) + return -EOPNOTSUPP; + + switch ( gic_hw_version() ) + { + case GIC_V3: + gic_version = XEN_DOMCTL_CONFIG_GIC_V3; + break; + case GIC_V2: + gic_version = XEN_DOMCTL_CONFIG_GIC_V2; + break; + default: + BUG(); + } + + domctl->u.configuredomain.gic_version = gic_version; + + /* TODO: Make the copy generic for all ARCH domctl */ + if ( __copy_to_guest(u_domctl, domctl, 1) ) + return -EFAULT; + + return 0; + } default: return subarch_do_domctl(domctl, d, u_domctl); diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 91161a2..076aa62 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -906,7 +906,21 @@ static int gicv_v3_init(struct domain *d) d->arch.vgic.rdist_count = gicv3.rdist_count; } else - d->arch.vgic.dbase = GUEST_GICD_BASE; + { + d->arch.vgic.dbase = GUEST_GICV3_GICD_BASE; + d->arch.vgic.dbase_size = GUEST_GICV3_GICD_SIZE; + + /* XXX: Only one Re-distributor region mapped for the guest */ + BUILD_BUG_ON(GUEST_GICV3_RDIST_REGIONS != 1); + + d->arch.vgic.rdist_count = GUEST_GICV3_RDIST_REGIONS; + d->arch.vgic.rdist_stride = GUEST_GICV3_RDIST_STRIDE; + + /* The first redistributor should contain enough space for all CPUs */ + BUILD_BUG_ON((GUEST_GICV3_GICR0_SIZE / GUEST_GICV3_RDIST_STRIDE) < MAX_VIRT_CPUS); + d->arch.vgic.rbase[0] = GUEST_GICV3_GICR0_BASE; + d->arch.vgic.rbase_size[0] = GUEST_GICV3_GICR0_SIZE; + } d->arch.vgic.nr_lines = 0; diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index ac54cd6..e711606 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -364,11 +364,27 @@ typedef uint64_t xen_callback_t; */ /* Physical Address Space */ + +/* vGIC mappings: Only one set of mapping is used by the guest. + * Therefore they can overlap. + */ + +/* vGIC v2 mappings */ #define GUEST_GICD_BASE 0x03001000ULL #define GUEST_GICD_SIZE 0x00001000ULL #define GUEST_GICC_BASE 0x03002000ULL #define GUEST_GICC_SIZE 0x00000100ULL +/* vGIC v3 mappings */ +#define GUEST_GICV3_GICD_BASE 0x03001000ULL +#define GUEST_GICV3_GICD_SIZE 0x00010000ULL + +#define GUEST_GICV3_RDIST_STRIDE 0x20000ULL +#define GUEST_GICV3_RDIST_REGIONS 1 + +#define GUEST_GICV3_GICR0_BASE 0x03020000ULL /* vCPU0 - vCPU7 */ +#define GUEST_GICV3_GICR0_SIZE 0x00100000ULL + /* 16MB == 4096 pages reserved for guest to use as a region to map its * grant table in. */ diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 58b19e7..8da204e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -68,6 +68,19 @@ struct xen_domctl_createdomain { typedef struct xen_domctl_createdomain xen_domctl_createdomain_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_createdomain_t); +#if defined(__arm__) || defined(__aarch64__) +#define XEN_DOMCTL_CONFIG_GIC_DEFAULT 0 +#define XEN_DOMCTL_CONFIG_GIC_V2 1 +#define XEN_DOMCTL_CONFIG_GIC_V3 2 +/* XEN_DOMCTL_configure_domain */ +struct xen_domctl_arm_configuredomain { + /* IN/OUT parameters */ + uint8_t gic_version; +}; +typedef struct xen_domctl_arm_configuredomain xen_domctl_arm_configuredomain_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_arm_configuredomain_t); +#endif + /* XEN_DOMCTL_getdomaininfo */ struct xen_domctl_getdomaininfo { /* OUT variables. */ @@ -1056,6 +1069,7 @@ struct xen_domctl { #define XEN_DOMCTL_set_vcpu_msrs 73 #define XEN_DOMCTL_setvnumainfo 74 #define XEN_DOMCTL_psr_cmt_op 75 +#define XEN_DOMCTL_arm_configure_domain 76 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1064,6 +1078,9 @@ struct xen_domctl { domid_t domain; union { struct xen_domctl_createdomain createdomain; +#if defined(__arm__) || defined(__aarch64__) + struct xen_domctl_arm_configuredomain configuredomain; +#endif struct xen_domctl_getdomaininfo getdomaininfo; struct xen_domctl_getmemlist getmemlist; struct xen_domctl_getpageframeinfo getpageframeinfo; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 6d0fe72..846cf88 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -727,6 +727,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cmt_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP); + case XEN_DOMCTL_configure_domain: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CONFIGURE_DOMAIN); + default: printk("flask_domctl: Unknown op %d\n", cmd); return -EPERM; diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index de0c707..bfe2fa5 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -216,6 +216,8 @@ class domain2 get_vnumainfo # XEN_DOMCTL_psr_cmt_op psr_cmt_op +# XEN_DOMCTL_configure_domain + configure_domain } # Similar to class domain, but primarily contains domctls related to HVM domains -- generated by git-patchbot for /home/xen/git/xen.git#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 11 08:00:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08: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 1Xo6NI-0005AT-QY; Tue, 11 Nov 2014 08:00:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NH-0005A7-AV for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:27 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id D2/14-26740-A12C1645; Tue, 11 Nov 2014 08:00:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1415692824!11603264!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.5 required=7.0 tests=BODY_RANDOM_LONG,LONGWORDS X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26876 invoked from network); 11 Nov 2014 08:00:25 -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; 11 Nov 2014 08:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NE-000878-4b for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6NE-00029X-2g for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:24 +0000 Date: Tue, 11 Nov 2014 08:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for GICv3 for domU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fda1614e1e95e7ecdfa97ea0afb80597ef8dbbc7 Author: Julien Grall AuthorDate: Wed Nov 5 13:04:22 2014 +0000 Commit: Ian Campbell CommitDate: Mon Nov 10 12:03:35 2014 +0000 xen/arm: Add support for GICv3 for domU The vGIC will emulate the same version as the hardware. The toolstack has to retrieve the version of the vGIC in order to be able to create the corresponding device tree node. A new DOMCTL has been introduced for ARM to configure the domain. For now it only allow the toolstack to retrieve the version of vGIC. This DOMCTL will be extend later to let the user choose the version of the emulated GIC. Signed-off-by: Vijaya Kumar K Signed-off-by: Julien Grall Cc: Ian Jackson Cc: Jan Beulich Acked-by: Daniel De Graaf Cc: Wei Liu Acked-by: Ian Campbell --- tools/flask/policy/policy/modules/xen/xen.if | 2 +- tools/libxc/include/xenctrl.h | 6 ++ tools/libxc/xc_domain.c | 20 ++++++ tools/libxl/libxl_arm.c | 95 ++++++++++++++++++++++++-- xen/arch/arm/domctl.c | 35 ++++++++++ xen/arch/arm/gic-v3.c | 16 ++++- xen/include/public/arch-arm.h | 16 ++++ xen/include/public/domctl.h | 17 +++++ xen/xsm/flask/hooks.c | 3 + xen/xsm/flask/policy/access_vectors | 2 + 10 files changed, 204 insertions(+), 8 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index 641c797..fa69c9d 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -49,7 +49,7 @@ define(`create_domain_common', ` getdomaininfo hypercall setvcpucontext setextvcpucontext getscheduler getvcpuinfo getvcpuextstate getaddrsize getaffinity setaffinity }; - allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op }; + allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op configure_domain }; allow $1 $2:security check_context; allow $1 $2:shadow enable; allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op }; diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 564e187..45e282c 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -483,6 +483,12 @@ int xc_domain_create(xc_interface *xch, uint32_t flags, uint32_t *pdomid); +#if defined(__arm__) || defined(__aarch64__) +typedef xen_domctl_arm_configuredomain_t xc_domain_configuration_t; + +int xc_domain_configure(xc_interface *xch, uint32_t domid, + xc_domain_configuration_t *config); +#endif /* Functions to produce a dump of a given domain * xc_domain_dumpcore - produces a dump to a specified file diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index a9bcd4a..b071dea 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -48,6 +48,26 @@ int xc_domain_create(xc_interface *xch, return 0; } +#if defined(__arm__) || defined(__aarch64__) +int xc_domain_configure(xc_interface *xch, uint32_t domid, + xc_domain_configuration_t *config) +{ + int rc; + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_arm_configure_domain; + domctl.domain = (domid_t)domid; + /* xc_domain_configure_t is an alias of xen_domctl_arm_configuredomain */ + memcpy(&domctl.u.configuredomain, config, sizeof(*config)); + + rc = do_domctl(xch, &domctl); + if ( !rc ) + memcpy(config, &domctl.u.configuredomain, sizeof(*config)); + + return rc; +} +#endif + int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, xen_pfn_t start_pfn, xen_pfn_t nr_pfns) { diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index a122e4a..448ac07 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -23,6 +23,18 @@ #define DT_IRQ_TYPE_LEVEL_HIGH 0x00000004 #define DT_IRQ_TYPE_LEVEL_LOW 0x00000008 +static const char *gicv_to_string(uint8_t gic_version) +{ + switch (gic_version) { + case XEN_DOMCTL_CONFIG_GIC_V2: + return "V2"; + case XEN_DOMCTL_CONFIG_GIC_V3: + return "V3"; + default: + return "unknown"; + } +} + int libxl__arch_domain_create(libxl__gc *gc, libxl_domain_config *d_config, uint32_t domid) { @@ -307,9 +319,9 @@ static int make_memory_nodes(libxl__gc *gc, void *fdt, return 0; } -static int make_intc_node(libxl__gc *gc, void *fdt, - uint64_t gicd_base, uint64_t gicd_size, - uint64_t gicc_base, uint64_t gicc_size) +static int make_gicv2_node(libxl__gc *gc, void *fdt, + uint64_t gicd_base, uint64_t gicd_size, + uint64_t gicc_base, uint64_t gicc_size) { int res; const char *name = GCSPRINTF("interrupt-controller@%"PRIx64, gicd_base); @@ -350,6 +362,56 @@ static int make_intc_node(libxl__gc *gc, void *fdt, return 0; } +static int make_gicv3_node(libxl__gc *gc, void *fdt) +{ + int res; + const uint64_t gicd_base = GUEST_GICV3_GICD_BASE; + const uint64_t gicd_size = GUEST_GICV3_GICD_SIZE; + const uint64_t gicr0_base = GUEST_GICV3_GICR0_BASE; + const uint64_t gicr0_size = GUEST_GICV3_GICR0_SIZE; + const char *name = GCSPRINTF("interrupt-controller@%"PRIx64, gicd_base); + + res = fdt_begin_node(fdt, name); + if (res) return res; + + res = fdt_property_compat(gc, fdt, 1, "arm,gic-v3"); + 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_cell(fdt, "redistributor-stride", + GUEST_GICV3_RDIST_STRIDE); + if (res) return res; + + res = fdt_property_cell(fdt, "#redistributor-regions", + GUEST_GICV3_RDIST_REGIONS); + if (res) return res; + + res = fdt_property_regs(gc, fdt, ROOT_ADDRESS_CELLS, ROOT_SIZE_CELLS, + 2, + gicd_base, gicd_size, + gicr0_base, gicr0_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; @@ -456,6 +518,7 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, libxl_domain_build_info *info, struct xc_dom_image *dom) { + xc_domain_configuration_t config; void *fdt = NULL; int rc, res; size_t fdt_size = 0; @@ -471,8 +534,16 @@ int libxl__arch_domain_init_hw_description(libxl__gc *gc, ainfo = get_arch_info(gc, dom); if (ainfo == NULL) return ERROR_FAIL; + LOG(DEBUG, "configure the domain"); + config.gic_version = XEN_DOMCTL_CONFIG_GIC_DEFAULT; + if (xc_domain_configure(CTX->xch, dom->guest_domid, &config) != 0) { + LOG(ERROR, "couldn't configure the domain"); + return ERROR_FAIL; + } + LOG(DEBUG, "constructing DTB for Xen version %d.%d guest", vers->xen_version_major, vers->xen_version_minor); + LOG(DEBUG, " - vGIC version: %s", gicv_to_string(config.gic_version)); /* * Call "call" handling FDR_ERR_*. Will either: @@ -520,9 +591,21 @@ next_resize: FDT( make_psci_node(gc, fdt) ); FDT( make_memory_nodes(gc, fdt, dom) ); - FDT( make_intc_node(gc, fdt, - GUEST_GICD_BASE, GUEST_GICD_SIZE, - GUEST_GICC_BASE, GUEST_GICD_SIZE) ); + + switch (config.gic_version) { + case XEN_DOMCTL_CONFIG_GIC_V2: + FDT( make_gicv2_node(gc, fdt, + GUEST_GICD_BASE, GUEST_GICD_SIZE, + GUEST_GICC_BASE, GUEST_GICC_SIZE) ); + break; + case XEN_DOMCTL_CONFIG_GIC_V3: + FDT( make_gicv3_node(gc, fdt) ); + break; + default: + LOG(ERROR, "Unknown GIC version %d", config.gic_version); + rc = ERROR_FAIL; + goto out; + } FDT( make_timer_node(gc, fdt, ainfo) ); FDT( make_hypervisor_node(gc, fdt, vers) ); diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index 45974e7..d246e84 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, @@ -30,6 +32,39 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, return p2m_cache_flush(d, s, e); } + case XEN_DOMCTL_arm_configure_domain: + { + uint8_t gic_version; + + /* + * Currently the vGIC is emulating the same version of the + * hardware GIC. Only the value XEN_DOMCTL_CONFIG_GIC_DEFAULT + * is allowed. The DOMCTL will return the actual version of the + * GIC. + */ + if ( domctl->u.configuredomain.gic_version != XEN_DOMCTL_CONFIG_GIC_DEFAULT ) + return -EOPNOTSUPP; + + switch ( gic_hw_version() ) + { + case GIC_V3: + gic_version = XEN_DOMCTL_CONFIG_GIC_V3; + break; + case GIC_V2: + gic_version = XEN_DOMCTL_CONFIG_GIC_V2; + break; + default: + BUG(); + } + + domctl->u.configuredomain.gic_version = gic_version; + + /* TODO: Make the copy generic for all ARCH domctl */ + if ( __copy_to_guest(u_domctl, domctl, 1) ) + return -EFAULT; + + return 0; + } default: return subarch_do_domctl(domctl, d, u_domctl); diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 91161a2..076aa62 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -906,7 +906,21 @@ static int gicv_v3_init(struct domain *d) d->arch.vgic.rdist_count = gicv3.rdist_count; } else - d->arch.vgic.dbase = GUEST_GICD_BASE; + { + d->arch.vgic.dbase = GUEST_GICV3_GICD_BASE; + d->arch.vgic.dbase_size = GUEST_GICV3_GICD_SIZE; + + /* XXX: Only one Re-distributor region mapped for the guest */ + BUILD_BUG_ON(GUEST_GICV3_RDIST_REGIONS != 1); + + d->arch.vgic.rdist_count = GUEST_GICV3_RDIST_REGIONS; + d->arch.vgic.rdist_stride = GUEST_GICV3_RDIST_STRIDE; + + /* The first redistributor should contain enough space for all CPUs */ + BUILD_BUG_ON((GUEST_GICV3_GICR0_SIZE / GUEST_GICV3_RDIST_STRIDE) < MAX_VIRT_CPUS); + d->arch.vgic.rbase[0] = GUEST_GICV3_GICR0_BASE; + d->arch.vgic.rbase_size[0] = GUEST_GICV3_GICR0_SIZE; + } d->arch.vgic.nr_lines = 0; diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index ac54cd6..e711606 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -364,11 +364,27 @@ typedef uint64_t xen_callback_t; */ /* Physical Address Space */ + +/* vGIC mappings: Only one set of mapping is used by the guest. + * Therefore they can overlap. + */ + +/* vGIC v2 mappings */ #define GUEST_GICD_BASE 0x03001000ULL #define GUEST_GICD_SIZE 0x00001000ULL #define GUEST_GICC_BASE 0x03002000ULL #define GUEST_GICC_SIZE 0x00000100ULL +/* vGIC v3 mappings */ +#define GUEST_GICV3_GICD_BASE 0x03001000ULL +#define GUEST_GICV3_GICD_SIZE 0x00010000ULL + +#define GUEST_GICV3_RDIST_STRIDE 0x20000ULL +#define GUEST_GICV3_RDIST_REGIONS 1 + +#define GUEST_GICV3_GICR0_BASE 0x03020000ULL /* vCPU0 - vCPU7 */ +#define GUEST_GICV3_GICR0_SIZE 0x00100000ULL + /* 16MB == 4096 pages reserved for guest to use as a region to map its * grant table in. */ diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 58b19e7..8da204e 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -68,6 +68,19 @@ struct xen_domctl_createdomain { typedef struct xen_domctl_createdomain xen_domctl_createdomain_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_createdomain_t); +#if defined(__arm__) || defined(__aarch64__) +#define XEN_DOMCTL_CONFIG_GIC_DEFAULT 0 +#define XEN_DOMCTL_CONFIG_GIC_V2 1 +#define XEN_DOMCTL_CONFIG_GIC_V3 2 +/* XEN_DOMCTL_configure_domain */ +struct xen_domctl_arm_configuredomain { + /* IN/OUT parameters */ + uint8_t gic_version; +}; +typedef struct xen_domctl_arm_configuredomain xen_domctl_arm_configuredomain_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_arm_configuredomain_t); +#endif + /* XEN_DOMCTL_getdomaininfo */ struct xen_domctl_getdomaininfo { /* OUT variables. */ @@ -1056,6 +1069,7 @@ struct xen_domctl { #define XEN_DOMCTL_set_vcpu_msrs 73 #define XEN_DOMCTL_setvnumainfo 74 #define XEN_DOMCTL_psr_cmt_op 75 +#define XEN_DOMCTL_arm_configure_domain 76 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1064,6 +1078,9 @@ struct xen_domctl { domid_t domain; union { struct xen_domctl_createdomain createdomain; +#if defined(__arm__) || defined(__aarch64__) + struct xen_domctl_arm_configuredomain configuredomain; +#endif struct xen_domctl_getdomaininfo getdomaininfo; struct xen_domctl_getmemlist getmemlist; struct xen_domctl_getpageframeinfo getpageframeinfo; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 6d0fe72..846cf88 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -727,6 +727,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cmt_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP); + case XEN_DOMCTL_configure_domain: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CONFIGURE_DOMAIN); + default: printk("flask_domctl: Unknown op %d\n", cmd); return -EPERM; diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index de0c707..bfe2fa5 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -216,6 +216,8 @@ class domain2 get_vnumainfo # XEN_DOMCTL_psr_cmt_op psr_cmt_op +# XEN_DOMCTL_configure_domain + configure_domain } # Similar to class domain, but primarily contains domctls related to HVM domains -- generated by git-patchbot for /home/xen/git/xen.git#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 11 08:00:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NS-0005CM-7K; Tue, 11 Nov 2014 08:00:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NQ-0005C4-Pf for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:36 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 15/F9-08051-422C1645; Tue, 11 Nov 2014 08:00:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1415692834!12656392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25300 invoked from network); 11 Nov 2014 08:00:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2014 08:00:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NO-00087I-B6 for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6NO-00029x-8Q for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:34 +0000 Date: Tue, 11 Nov 2014 08:00:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvgrub: ignore NUL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6fa63d6cf8e79de2cfb2d428269b6d6f698c3d2 Author: Stefano Stabellini AuthorDate: Thu Nov 6 10:41:28 2014 +0000 Commit: Ian Campbell CommitDate: Mon Nov 10 12:03:36 2014 +0000 pvgrub: ignore NUL When using pvgrub in graphical mode with vnc, the grub timeout doesn't work: the countdown doesn't even start. With a serial terminal the problem doesn't occur and the countdown works as expected. It turns out that the problem is that when using a graphical terminal, checkkey () returns 0 instead of -1 when there is no activity on the mouse or keyboard. As a consequence grub thinks that the user typed something and interrupts the count down. To fix the issue simply ignore keystrokes returning 0, that is the NUL character anyway. Add a patch to grub.patches to do that. Signed-off-by: Stefano Stabellini Tested-by: Steven Haigh Acked-by: Samuel Thibault --- stubdom/grub.patches/11graphics-keyboard.diff | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/stubdom/grub.patches/11graphics-keyboard.diff b/stubdom/grub.patches/11graphics-keyboard.diff new file mode 100644 index 0000000..fe17b20 --- /dev/null +++ b/stubdom/grub.patches/11graphics-keyboard.diff @@ -0,0 +1,13 @@ +diff --git a/stage2/stage2.c b/stage2/stage2.c +index 9d9fcc3..8353a3b 100644 +--- a/stage2/stage2.c ++++ b/stage2/stage2.c +@@ -395,7 +395,7 @@ restart: + pressed. + This avoids polling (relevant in the grub-shell and later on + in grub if interrupt driven I/O is done). */ +- if (checkkey () >= 0 || grub_timeout < 0) ++ if (checkkey () > 0 || grub_timeout < 0) + { + /* Key was pressed, show which entry is selected before GETKEY, + since we're comming in here also on GRUB_TIMEOUT == -1 and -- generated by git-patchbot for /home/xen/git/xen.git#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 11 08:00:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 11 Nov 2014 08:00:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NS-0005CM-7K; Tue, 11 Nov 2014 08:00:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NQ-0005C4-Pf for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:36 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 15/F9-08051-422C1645; Tue, 11 Nov 2014 08:00:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1415692834!12656392!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25300 invoked from network); 11 Nov 2014 08:00:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Nov 2014 08:00:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xo6NO-00087I-B6 for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xo6NO-00029x-8Q for xen-changelog@lists.xensource.com; Tue, 11 Nov 2014 08:00:34 +0000 Date: Tue, 11 Nov 2014 08:00:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pvgrub: ignore NUL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6fa63d6cf8e79de2cfb2d428269b6d6f698c3d2 Author: Stefano Stabellini AuthorDate: Thu Nov 6 10:41:28 2014 +0000 Commit: Ian Campbell CommitDate: Mon Nov 10 12:03:36 2014 +0000 pvgrub: ignore NUL When using pvgrub in graphical mode with vnc, the grub timeout doesn't work: the countdown doesn't even start. With a serial terminal the problem doesn't occur and the countdown works as expected. It turns out that the problem is that when using a graphical terminal, checkkey () returns 0 instead of -1 when there is no activity on the mouse or keyboard. As a consequence grub thinks that the user typed something and interrupts the count down. To fix the issue simply ignore keystrokes returning 0, that is the NUL character anyway. Add a patch to grub.patches to do that. Signed-off-by: Stefano Stabellini Tested-by: Steven Haigh Acked-by: Samuel Thibault --- stubdom/grub.patches/11graphics-keyboard.diff | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/stubdom/grub.patches/11graphics-keyboard.diff b/stubdom/grub.patches/11graphics-keyboard.diff new file mode 100644 index 0000000..fe17b20 --- /dev/null +++ b/stubdom/grub.patches/11graphics-keyboard.diff @@ -0,0 +1,13 @@ +diff --git a/stage2/stage2.c b/stage2/stage2.c +index 9d9fcc3..8353a3b 100644 +--- a/stage2/stage2.c ++++ b/stage2/stage2.c +@@ -395,7 +395,7 @@ restart: + pressed. + This avoids polling (relevant in the grub-shell and later on + in grub if interrupt driven I/O is done). */ +- if (checkkey () >= 0 || grub_timeout < 0) ++ if (checkkey () > 0 || grub_timeout < 0) + { + /* Key was pressed, show which entry is selected before GETKEY, + since we're comming in here also on GRUB_TIMEOUT == -1 and -- generated by git-patchbot for /home/xen/git/xen.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 13 14:11:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Nov 2014 14:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov78-0003iu-6N; Thu, 13 Nov 2014 14:11:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov76-0003ie-Pm for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:08 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 9B/3F-02698-CFBB4645; Thu, 13 Nov 2014 14:11:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1415887866!12325847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13333 invoked from network); 13 Nov 2014 14:11:07 -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 2014 14:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov70-0000zK-Ui for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xov70-0003Om-Ps for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:02 +0000 Message-Id: Date: Thu, 13 Nov 2014 14:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] HYPERVISOR_memory_op() needs to have "long" return 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 # HG changeset patch # User Jan Beulich # Date 1415886667 -3600 # Node ID 6d727f2dcc8386e9658d84082f45633c08d992d1 # Parent 851b8fba77e7bc08cacab58c3ff277ed8473f048 HYPERVISOR_memory_op() needs to have "long" return type ... on 64-bit architectures. Otherwise using it with e.g. XENMEM_maximum_ram_page may truncate significant bits. Signed-off-by: Jan Beulich --- diff -r 851b8fba77e7 -r 6d727f2dcc83 include/asm-ia64/hypercall.h --- a/include/asm-ia64/hypercall.h Tue Oct 07 11:56:56 2014 +0200 +++ b/include/asm-ia64/hypercall.h Thu Nov 13 14:51:07 2014 +0100 @@ -144,10 +144,10 @@ xencomm_arch_hypercall_multicall(struct return _hypercall2(int, multicall, call_list, nr_calls); } -static inline int +static inline long xencomm_arch_hypercall_memory_op(unsigned int cmd, struct xencomm_handle *arg) { - return _hypercall2(int, memory_op, cmd, arg); + return _hypercall2(long, memory_op, cmd, arg); } static inline int diff -r 851b8fba77e7 -r 6d727f2dcc83 include/asm-x86_64/mach-xen/asm/hypercall.h --- a/include/asm-x86_64/mach-xen/asm/hypercall.h Tue Oct 07 11:56:56 2014 +0200 +++ b/include/asm-x86_64/mach-xen/asm/hypercall.h Thu Nov 13 14:51:07 2014 +0100 @@ -248,11 +248,11 @@ HYPERVISOR_update_descriptor( return _hypercall2(int, update_descriptor, ma, word); } -static inline int __must_check +static inline long __must_check HYPERVISOR_memory_op( unsigned int cmd, void *arg) { - return _hypercall2(int, memory_op, cmd, arg); + return _hypercall2(long, memory_op, cmd, arg); } static inline int __must_check _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 13 14:11:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Nov 2014 14:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov78-0003ip-3T; Thu, 13 Nov 2014 14:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov76-0003id-Lp for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:08 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id A1/8D-26740-BFBB4645; Thu, 13 Nov 2014 14:11:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-31.messagelabs.com!1415887866!11162241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4986 invoked from network); 13 Nov 2014 14:11:07 -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 2014 14:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov71-0000zL-8E for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xov71-0003P1-6z for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:03 +0000 Message-Id: Date: Thu, 13 Nov 2014 14:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: use custom dma_get_required_mask() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User David Vrabel # Date 1415886941 -3600 # Node ID 78e400792c76811445c6a80dfebdbded116f1aad # Parent 6d727f2dcc8386e9658d84082f45633c08d992d1 x86: use custom dma_get_required_mask() On a Xen PV guest the DMA addresses and physical addresses are not 1:1 (such as Xen PV guests) and the generic dma_get_required_mask() does not return the correct mask (since it uses max_pfn). Some device drivers (such as mptsas, mpt2sas) use dma_get_required_mask() to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly. Provide a get_required_mask op that uses the maximum MFN to calculate the DMA mask. Signed-off-by: David Vrabel Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 6d727f2dcc83 -r 78e400792c76 arch/i386/kernel/pci-dma-xen.c --- a/arch/i386/kernel/pci-dma-xen.c Thu Nov 13 14:51:07 2014 +0100 +++ b/arch/i386/kernel/pci-dma-xen.c Thu Nov 13 14:55:41 2014 +0100 @@ -22,6 +22,8 @@ #include #include +#include + #ifdef __x86_64__ #include @@ -208,6 +210,16 @@ dma_supported(struct device *dev, u64 ma } EXPORT_SYMBOL(dma_supported); +u64 dma_get_required_mask(struct device *dev) +{ + unsigned long max_mfn = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, + NULL); + + return (((u64)1 << (__fls(max_mfn - 1) + 1 + PAGE_SHIFT)) - 1) + & *dev->dma_mask; +} +EXPORT_SYMBOL_GPL(dma_get_required_mask); + void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { diff -r 6d727f2dcc83 -r 78e400792c76 include/asm-i386/bitops.h --- a/include/asm-i386/bitops.h Thu Nov 13 14:51:07 2014 +0100 +++ b/include/asm-i386/bitops.h Thu Nov 13 14:55:41 2014 +0100 @@ -318,6 +318,20 @@ static inline unsigned long __ffs(unsign return word; } +/* + * __fls: find last bit set. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static inline unsigned long __fls(unsigned long word) +{ + __asm__("bsrl %1,%0" + :"=r" (word) + :"rm" (word)); + return word; +} + /** * find_first_bit - find the first set bit in a memory region * @addr: The address to start the search at diff -r 6d727f2dcc83 -r 78e400792c76 include/asm-i386/mach-xen/asm/dma-mapping.h --- a/include/asm-i386/mach-xen/asm/dma-mapping.h Thu Nov 13 14:51:07 2014 +0100 +++ b/include/asm-i386/mach-xen/asm/dma-mapping.h Thu Nov 13 14:55:41 2014 +0100 @@ -12,6 +12,8 @@ #include #include +#define ARCH_HAS_DMA_GET_REQUIRED_MASK + static inline int address_needs_mapping(struct device *hwdev, dma_addr_t addr) { diff -r 6d727f2dcc83 -r 78e400792c76 include/asm-x86_64/mach-xen/asm/dma-mapping.h --- a/include/asm-x86_64/mach-xen/asm/dma-mapping.h Thu Nov 13 14:51:07 2014 +0100 +++ b/include/asm-x86_64/mach-xen/asm/dma-mapping.h Thu Nov 13 14:55:41 2014 +0100 @@ -11,6 +11,8 @@ #include #include +#define ARCH_HAS_DMA_GET_REQUIRED_MASK + struct dma_mapping_ops { int (*mapping_error)(dma_addr_t dma_addr); void* (*alloc_coherent)(struct device *dev, size_t size, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 13 14:11:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Nov 2014 14:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov78-0003iu-6N; Thu, 13 Nov 2014 14:11:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov76-0003ie-Pm for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:08 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 9B/3F-02698-CFBB4645; Thu, 13 Nov 2014 14:11:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-27.messagelabs.com!1415887866!12325847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13333 invoked from network); 13 Nov 2014 14:11:07 -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 2014 14:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov70-0000zK-Ui for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xov70-0003Om-Ps for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:02 +0000 Message-Id: Date: Thu, 13 Nov 2014 14:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] HYPERVISOR_memory_op() needs to have "long" return 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 # HG changeset patch # User Jan Beulich # Date 1415886667 -3600 # Node ID 6d727f2dcc8386e9658d84082f45633c08d992d1 # Parent 851b8fba77e7bc08cacab58c3ff277ed8473f048 HYPERVISOR_memory_op() needs to have "long" return type ... on 64-bit architectures. Otherwise using it with e.g. XENMEM_maximum_ram_page may truncate significant bits. Signed-off-by: Jan Beulich --- diff -r 851b8fba77e7 -r 6d727f2dcc83 include/asm-ia64/hypercall.h --- a/include/asm-ia64/hypercall.h Tue Oct 07 11:56:56 2014 +0200 +++ b/include/asm-ia64/hypercall.h Thu Nov 13 14:51:07 2014 +0100 @@ -144,10 +144,10 @@ xencomm_arch_hypercall_multicall(struct return _hypercall2(int, multicall, call_list, nr_calls); } -static inline int +static inline long xencomm_arch_hypercall_memory_op(unsigned int cmd, struct xencomm_handle *arg) { - return _hypercall2(int, memory_op, cmd, arg); + return _hypercall2(long, memory_op, cmd, arg); } static inline int diff -r 851b8fba77e7 -r 6d727f2dcc83 include/asm-x86_64/mach-xen/asm/hypercall.h --- a/include/asm-x86_64/mach-xen/asm/hypercall.h Tue Oct 07 11:56:56 2014 +0200 +++ b/include/asm-x86_64/mach-xen/asm/hypercall.h Thu Nov 13 14:51:07 2014 +0100 @@ -248,11 +248,11 @@ HYPERVISOR_update_descriptor( return _hypercall2(int, update_descriptor, ma, word); } -static inline int __must_check +static inline long __must_check HYPERVISOR_memory_op( unsigned int cmd, void *arg) { - return _hypercall2(int, memory_op, cmd, arg); + return _hypercall2(long, memory_op, cmd, arg); } static inline int __must_check _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 13 14:11:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Nov 2014 14:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov78-0003ip-3T; Thu, 13 Nov 2014 14:11:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov76-0003id-Lp for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:08 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id A1/8D-26740-BFBB4645; Thu, 13 Nov 2014 14:11:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-31.messagelabs.com!1415887866!11162241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4986 invoked from network); 13 Nov 2014 14:11:07 -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 2014 14:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xov71-0000zL-8E for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xov71-0003P1-6z for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:11:03 +0000 Message-Id: Date: Thu, 13 Nov 2014 14:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86: use custom dma_get_required_mask() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User David Vrabel # Date 1415886941 -3600 # Node ID 78e400792c76811445c6a80dfebdbded116f1aad # Parent 6d727f2dcc8386e9658d84082f45633c08d992d1 x86: use custom dma_get_required_mask() On a Xen PV guest the DMA addresses and physical addresses are not 1:1 (such as Xen PV guests) and the generic dma_get_required_mask() does not return the correct mask (since it uses max_pfn). Some device drivers (such as mptsas, mpt2sas) use dma_get_required_mask() to set the device's DMA mask to allow them to use only 32-bit DMA addresses in hardware structures. This results in unnecessary use of the SWIOTLB if DMA addresses are more than 32-bits, impacting performance significantly. Provide a get_required_mask op that uses the maximum MFN to calculate the DMA mask. Signed-off-by: David Vrabel Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 6d727f2dcc83 -r 78e400792c76 arch/i386/kernel/pci-dma-xen.c --- a/arch/i386/kernel/pci-dma-xen.c Thu Nov 13 14:51:07 2014 +0100 +++ b/arch/i386/kernel/pci-dma-xen.c Thu Nov 13 14:55:41 2014 +0100 @@ -22,6 +22,8 @@ #include #include +#include + #ifdef __x86_64__ #include @@ -208,6 +210,16 @@ dma_supported(struct device *dev, u64 ma } EXPORT_SYMBOL(dma_supported); +u64 dma_get_required_mask(struct device *dev) +{ + unsigned long max_mfn = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, + NULL); + + return (((u64)1 << (__fls(max_mfn - 1) + 1 + PAGE_SHIFT)) - 1) + & *dev->dma_mask; +} +EXPORT_SYMBOL_GPL(dma_get_required_mask); + void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) { diff -r 6d727f2dcc83 -r 78e400792c76 include/asm-i386/bitops.h --- a/include/asm-i386/bitops.h Thu Nov 13 14:51:07 2014 +0100 +++ b/include/asm-i386/bitops.h Thu Nov 13 14:55:41 2014 +0100 @@ -318,6 +318,20 @@ static inline unsigned long __ffs(unsign return word; } +/* + * __fls: find last bit set. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static inline unsigned long __fls(unsigned long word) +{ + __asm__("bsrl %1,%0" + :"=r" (word) + :"rm" (word)); + return word; +} + /** * find_first_bit - find the first set bit in a memory region * @addr: The address to start the search at diff -r 6d727f2dcc83 -r 78e400792c76 include/asm-i386/mach-xen/asm/dma-mapping.h --- a/include/asm-i386/mach-xen/asm/dma-mapping.h Thu Nov 13 14:51:07 2014 +0100 +++ b/include/asm-i386/mach-xen/asm/dma-mapping.h Thu Nov 13 14:55:41 2014 +0100 @@ -12,6 +12,8 @@ #include #include +#define ARCH_HAS_DMA_GET_REQUIRED_MASK + static inline int address_needs_mapping(struct device *hwdev, dma_addr_t addr) { diff -r 6d727f2dcc83 -r 78e400792c76 include/asm-x86_64/mach-xen/asm/dma-mapping.h --- a/include/asm-x86_64/mach-xen/asm/dma-mapping.h Thu Nov 13 14:51:07 2014 +0100 +++ b/include/asm-x86_64/mach-xen/asm/dma-mapping.h Thu Nov 13 14:55:41 2014 +0100 @@ -11,6 +11,8 @@ #include #include +#define ARCH_HAS_DMA_GET_REQUIRED_MASK + struct dma_mapping_ops { int (*mapping_error)(dma_addr_t dma_addr); void* (*alloc_coherent)(struct device *dev, size_t size, _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 13 14:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Nov 2014 14: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 1XovHk-00048C-7v; Thu, 13 Nov 2014 14:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XovHh-000484-6Y for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:22:06 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id AC/EC-22737-C8EB4645; Thu, 13 Nov 2014 14:22:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-206.messagelabs.com!1415888522!11150129!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24185 invoked from network); 13 Nov 2014 14:22:03 -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 2014 14:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XovHe-00016E-Nl for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XovHe-0003pW-HS for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:22:02 +0000 Message-Id: Date: Thu, 13 Nov 2014 14:22:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] ix86: don't even register bogus clock sources X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1415888232 -3600 # Node ID 49e06ed72c53a183378ec6efc97caf26846678e7 # Parent 78e400792c76811445c6a80dfebdbded116f1aad ix86: don't even register bogus clock sources Neither the raw TSC nor the PIT are suitable clock sources under Xen - don't even build the respective source files. The few things we need from them can be put in time-xen.c. Signed-off-by: Jan Beulich --- diff -r 78e400792c76 -r 49e06ed72c53 arch/i386/kernel/Makefile --- a/arch/i386/kernel/Makefile Thu Nov 13 14:55:41 2014 +0100 +++ b/arch/i386/kernel/Makefile Thu Nov 13 15:17:12 2014 +0100 @@ -84,5 +84,5 @@ SYSCFLAGS_vsyscall-syms.o = -r early_printk-y += ../../x86_64/kernel/early_printk.o k8-y += ../../x86_64/kernel/k8.o -disabled-obj-$(CONFIG_XEN) := i8237.o i8259.o reboot.o smpboot.o +disabled-obj-$(CONFIG_XEN) := i8237.o i8253.o i8259.o reboot.o smpboot.o tsc.o %/head.o %/head.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) := diff -r 78e400792c76 -r 49e06ed72c53 arch/i386/kernel/time-xen.c --- a/arch/i386/kernel/time-xen.c Thu Nov 13 14:55:41 2014 +0100 +++ b/arch/i386/kernel/time-xen.c Thu Nov 13 15:17:12 2014 +0100 @@ -75,6 +75,9 @@ #if defined (__i386__) #include +#include +DEFINE_SPINLOCK(i8253_lock); +EXPORT_SYMBOL(i8253_lock); #endif int pit_latch_buggy; /* extern */ @@ -552,11 +555,15 @@ static int set_rtc_mmss(unsigned long no return retval; } +#ifdef CONFIG_X86_64 /* monotonic_clock(): returns # of nanoseconds passed since time_init() * Note: This function is required to return accurate * time even in the absence of multiple timer ticks. */ unsigned long long monotonic_clock(void) +#else +unsigned long long sched_clock(void) +#endif { unsigned int cpu = get_cpu(); struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu); @@ -576,9 +583,9 @@ unsigned long long monotonic_clock(void) return time; } +#ifdef CONFIG_X86_64 EXPORT_SYMBOL(monotonic_clock); -#ifdef __x86_64__ unsigned long long sched_clock(void) { return monotonic_clock(); @@ -751,6 +758,27 @@ irqreturn_t timer_interrupt(int irq, voi return IRQ_HANDLED; } +#ifndef CONFIG_X86_64 + +void __init tsc_init(void) +{ + init_cpu_khz(); + printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n", + cpu_khz / 1000, cpu_khz % 1000); + + use_tsc_delay(); +} + +void mark_tsc_unstable(void) +{ +#ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */ + tsc_unstable = 1; +#endif +} +EXPORT_SYMBOL_GPL(mark_tsc_unstable); + +#endif + static void init_missing_ticks_accounting(unsigned int cpu) { struct vcpu_register_runstate_memory_area area; @@ -939,11 +967,11 @@ void __init time_init(void) update_wallclock(); +#ifdef CONFIG_X86_64 init_cpu_khz(); printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); -#if defined(__x86_64__) vxtime.mode = VXTIME_TSC; vxtime.quot = (1000000L << 32) / vxtime_hz; vxtime.tsc_quot = (1000L << 32) / cpu_khz; diff -r 78e400792c76 -r 49e06ed72c53 include/asm-i386/mach-xen/asm/processor.h --- a/include/asm-i386/mach-xen/asm/processor.h Thu Nov 13 14:55:41 2014 +0100 +++ b/include/asm-i386/mach-xen/asm/processor.h Thu Nov 13 15:17:12 2014 +0100 @@ -23,7 +23,7 @@ #include /* flag for disabling the tsc */ -extern int tsc_disable; +#define tsc_disable 0 struct desc_struct { unsigned long a,b; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Nov 13 14:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 13 Nov 2014 14: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 1XovHk-00048C-7v; Thu, 13 Nov 2014 14:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XovHh-000484-6Y for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:22:06 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id AC/EC-22737-C8EB4645; Thu, 13 Nov 2014 14:22:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-206.messagelabs.com!1415888522!11150129!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24185 invoked from network); 13 Nov 2014 14:22:03 -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 2014 14:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XovHe-00016E-Nl for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XovHe-0003pW-HS for xen-changelog@lists.xensource.com; Thu, 13 Nov 2014 14:22:02 +0000 Message-Id: Date: Thu, 13 Nov 2014 14:22:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] ix86: don't even register bogus clock sources X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1415888232 -3600 # Node ID 49e06ed72c53a183378ec6efc97caf26846678e7 # Parent 78e400792c76811445c6a80dfebdbded116f1aad ix86: don't even register bogus clock sources Neither the raw TSC nor the PIT are suitable clock sources under Xen - don't even build the respective source files. The few things we need from them can be put in time-xen.c. Signed-off-by: Jan Beulich --- diff -r 78e400792c76 -r 49e06ed72c53 arch/i386/kernel/Makefile --- a/arch/i386/kernel/Makefile Thu Nov 13 14:55:41 2014 +0100 +++ b/arch/i386/kernel/Makefile Thu Nov 13 15:17:12 2014 +0100 @@ -84,5 +84,5 @@ SYSCFLAGS_vsyscall-syms.o = -r early_printk-y += ../../x86_64/kernel/early_printk.o k8-y += ../../x86_64/kernel/k8.o -disabled-obj-$(CONFIG_XEN) := i8237.o i8259.o reboot.o smpboot.o +disabled-obj-$(CONFIG_XEN) := i8237.o i8253.o i8259.o reboot.o smpboot.o tsc.o %/head.o %/head.s: $(if $(CONFIG_XEN),EXTRA_AFLAGS,dummy) := diff -r 78e400792c76 -r 49e06ed72c53 arch/i386/kernel/time-xen.c --- a/arch/i386/kernel/time-xen.c Thu Nov 13 14:55:41 2014 +0100 +++ b/arch/i386/kernel/time-xen.c Thu Nov 13 15:17:12 2014 +0100 @@ -75,6 +75,9 @@ #if defined (__i386__) #include +#include +DEFINE_SPINLOCK(i8253_lock); +EXPORT_SYMBOL(i8253_lock); #endif int pit_latch_buggy; /* extern */ @@ -552,11 +555,15 @@ static int set_rtc_mmss(unsigned long no return retval; } +#ifdef CONFIG_X86_64 /* monotonic_clock(): returns # of nanoseconds passed since time_init() * Note: This function is required to return accurate * time even in the absence of multiple timer ticks. */ unsigned long long monotonic_clock(void) +#else +unsigned long long sched_clock(void) +#endif { unsigned int cpu = get_cpu(); struct shadow_time_info *shadow = &per_cpu(shadow_time, cpu); @@ -576,9 +583,9 @@ unsigned long long monotonic_clock(void) return time; } +#ifdef CONFIG_X86_64 EXPORT_SYMBOL(monotonic_clock); -#ifdef __x86_64__ unsigned long long sched_clock(void) { return monotonic_clock(); @@ -751,6 +758,27 @@ irqreturn_t timer_interrupt(int irq, voi return IRQ_HANDLED; } +#ifndef CONFIG_X86_64 + +void __init tsc_init(void) +{ + init_cpu_khz(); + printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n", + cpu_khz / 1000, cpu_khz % 1000); + + use_tsc_delay(); +} + +void mark_tsc_unstable(void) +{ +#ifndef CONFIG_XEN /* XXX Should tell the hypervisor about this fact. */ + tsc_unstable = 1; +#endif +} +EXPORT_SYMBOL_GPL(mark_tsc_unstable); + +#endif + static void init_missing_ticks_accounting(unsigned int cpu) { struct vcpu_register_runstate_memory_area area; @@ -939,11 +967,11 @@ void __init time_init(void) update_wallclock(); +#ifdef CONFIG_X86_64 init_cpu_khz(); printk(KERN_INFO "Xen reported: %u.%03u MHz processor.\n", cpu_khz / 1000, cpu_khz % 1000); -#if defined(__x86_64__) vxtime.mode = VXTIME_TSC; vxtime.quot = (1000000L << 32) / vxtime_hz; vxtime.tsc_quot = (1000L << 32) / cpu_khz; diff -r 78e400792c76 -r 49e06ed72c53 include/asm-i386/mach-xen/asm/processor.h --- a/include/asm-i386/mach-xen/asm/processor.h Thu Nov 13 14:55:41 2014 +0100 +++ b/include/asm-i386/mach-xen/asm/processor.h Thu Nov 13 15:17:12 2014 +0100 @@ -23,7 +23,7 @@ #include /* flag for disabling the tsc */ -extern int tsc_disable; +#define tsc_disable 0 struct desc_struct { unsigned long a,b; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCf0-0008P9-Rb; Fri, 14 Nov 2014 08:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCez-0008Op-Ia for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:17 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4F/2E-17694-473C5645; Fri, 14 Nov 2014 08:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1415955314!11334813!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17558 invoked from network); 14 Nov 2014 08:55:16 -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 2014 08:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCew-0004Sp-Gi for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCew-000290-Bl for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:14 +0000 Date: Fri, 14 Nov 2014 08:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] vmx: fix save/restore issue with apicv X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81b9db19fa454dc5e723d712d8800e865b0f24e5 Author: Yang Zhang AuthorDate: Thu Nov 13 09:43:33 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:43:33 2014 +0100 vmx: fix save/restore issue with apicv This patch fixes two issues: 1. Interrupts on PIR are lost during save/restore. Syncing the PIR into IRR during save will fix it. 2. EOI exit bitmap doesn't set up correctly after restore. Here we will construct the eoi exit bitmap via (IRR | ISR). Though it may cause unnecessary eoi exit of the interrupts that pending in IRR or ISR during save/restore, each pending interrupt only causes one vmexit. The subsequent interrupts will adjust the eoi exit bitmap correctly. So the performance hurt can be ignored. Signed-off-by: Yang Zhang Signed-off-by: Olaf Hering Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 607e8494c42397fb249191904066cace6ac9a880 master date: 2014-10-27 16:40:18 +0100 --- xen/arch/x86/hvm/vlapic.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 24 ++++++++++++++++++++++++ xen/include/asm-x86/hvm/vlapic.h | 2 ++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index bc06010..bd8c63e 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1161,6 +1161,9 @@ static int lapic_save_regs(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + if ( hvm_funcs.sync_pir_to_irr ) + hvm_funcs.sync_pir_to_irr(v); + s = vcpu_vlapic(v); if ( (rc = hvm_save_entry(LAPIC_REGS, v->vcpu_id, h, s->regs)) != 0 ) break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b05c88e..a6a850d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1530,6 +1530,8 @@ static void vmx_process_isr(int isr, struct vcpu *v) { unsigned long status; u8 old; + unsigned int i; + const struct vlapic *vlapic = vcpu_vlapic(v); if ( isr < 0 ) isr = 0; @@ -1543,6 +1545,28 @@ static void vmx_process_isr(int isr, struct vcpu *v) status |= isr << VMX_GUEST_INTR_STATUS_SVI_OFFSET; __vmwrite(GUEST_INTR_STATUS, status); } + + /* + * Theoretically, only level triggered interrupts can have their + * corresponding bits set in the eoi exit bitmap. That is, the bits + * set in the eoi exit bitmap should also be set in TMR. But a periodic + * timer interrupt does not follow the rule: it is edge triggered, but + * requires its corresponding bit be set in the eoi exit bitmap. So we + * should not construct the eoi exit bitmap based on TMR. + * Here we will construct the eoi exit bitmap via (IRR | ISR). This + * means that EOIs to the interrupts that are set in the IRR or ISR will + * cause VM exits after restoring, regardless of the trigger modes. It + * is acceptable because the subsequent interrupts will set up the eoi + * bitmap correctly. + */ + for ( i = 0x10; i < NR_VECTORS; ++i ) + if ( vlapic_test_vector(i, &vlapic->regs->data[APIC_IRR]) || + vlapic_test_vector(i, &vlapic->regs->data[APIC_ISR]) ) + set_bit(i, v->arch.hvm_vmx.eoi_exit_bitmap); + + for ( i = 0; i < ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); ++i ) + __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm_vmx.eoi_exit_bitmap[i]); + vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index 66f0aff..2994920 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -58,6 +58,8 @@ #define VEC_POS(v) ((v) % 32) #define REG_POS(v) (((v) / 32) * 0x10) +#define vlapic_test_vector(vec, bitmap) \ + test_bit(VEC_POS(vec), (const uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_set_vector(vec, bitmap) \ test_and_set_bit(VEC_POS(vec), (uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_clear_vector(vec, bitmap) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCeq-0008Ni-N8; Fri, 14 Nov 2014 08:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCep-0008NT-9H for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:07 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 58/F6-25547-A63C5645; Fri, 14 Nov 2014 08:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1415955304!11296732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22945 invoked from network); 14 Nov 2014 08:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCem-0004Sm-6x for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCel-00028Q-PL for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:03 +0000 Date: Fri, 14 Nov 2014 08:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] fix listing of vcpus when domains lacking any vcpus exist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a934e1551268edc5cddee297cf27e3f757198740 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:42:03 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:42:03 2014 +0100 fix listing of vcpus when domains lacking any vcpus exist On a system which looks like this: [root@st04 ~]# xl list Name ID Mem VCPUs State Time(s) Domain-0 0 752 4 r----- 46699.3 (null) 1 0 0 --p--- 0.0 (null) 2 0 0 --p--- 0.0 (null) 3 0 0 --p--- 0.0 badger 25 0 1 --p--- 0.0 `xl vcpu-list` failes as so: [root@st04 ~]# xl vcpu-list Name ID VCPU CPU State Time(s) CPU Affinity Domain-0 0 0 0 -b- 12171.0 all Domain-0 0 1 1 -b- 11779.6 all Domain-0 0 2 2 -b- 11599.0 all Domain-0 0 3 3 r-- 11007.0 all libxl: critical: libxl__calloc: libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) : Cannot allocate memory libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) The root cause of this is in Xen. getdomaininfo() has no way of expressing "this domain has no vcpus". Previously, info->max_vcpu_id would be returned uninitialised in such a case. Unfortunately, setting it to 0 as a default is not appropriate. A max_vcpu_id of 0 and nr_online_cpus of 0 is the valid state for a single vcpu domain which is in the process of being destroyed. As all components are required to add 1 to max_vcpu_id to get the number of vcpus, an id of ~0U is not valid to be used. Explicitly define this as an invalid max vcpu value, and use it to express "no vcpus" in getdomaininfo() In libxl, the issue is seen as libxl_list_vcpu() attempts to use the uninitialised domaininfo.max_vcpu_id for memory allocation. Check domaininfo.max_vcpu_id against the new sentinel value XEN_INVALID_MAX_VCPU_ID, and return early. This means that it is now valid for libxl_list_vcpu() to return NULL for a domain which lacks any vcpus. As part of this change, remove the pointless call to libxl_get_max_cpus(), whose returned value is unconditionally clobbered in the for() loop. Reported-by: Euan Harris Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Don Slutz Acked-by: Ian Campbell tools/libxl: Fix libxl_list_vcpu() following c/s 93e52d52 My reasoning regarding nr_cpus_out was wrong, as I had confused nr_cpus_out with nr_vcpus_out. Dario pointed this out, but the patch (having gained appropriate acks) got committed before I could post a correction. Noticed-by: Dario Faggioli Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell master commit: 93e52d5242804ff928131553599afa769f85481b master date: 2014-10-23 10:19:53 +0200 master commit: c90a755f261b8ccb3dac7e1f695122cac95c6053 master date: 2014-10-23 12:29:00 +0100 --- tools/libxl/libxl.c | 6 ++++++ tools/libxl/xl_cmdimpl.c | 4 +--- xen/common/domctl.c | 1 + xen/include/public/domctl.h | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2d29ad2..0e41739 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4551,6 +4551,12 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, GC_FREE; return NULL; } + + if (domaininfo.max_vcpu_id == XEN_INVALID_MAX_VCPU_ID) { + GC_FREE; + return NULL; + } + *nr_cpus_out = libxl_get_max_cpus(ctx); ret = ptr = libxl__calloc(NOGC, domaininfo.max_vcpu_id + 1, sizeof(libxl_vcpuinfo)); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4fc46eb..d1c45e4 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4580,10 +4580,8 @@ static void print_domain_vcpuinfo(uint32_t domid, uint32_t nr_cpus) vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nrcpus); - if (!vcpuinfo) { - fprintf(stderr, "libxl_list_vcpu failed.\n"); + if (!vcpuinfo) return; - } for (i = 0; i < nb_vcpu; i++) { print_vcpuinfo(domid, &vcpuinfo[i], nr_cpus); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 060af1b..3a55883 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -154,6 +154,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) struct vcpu_runstate_info runstate; info->domain = d->domain_id; + info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; info->nr_online_vcpus = 0; info->ssidref = 0; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index f22fe2e..7e0b517 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -107,6 +107,7 @@ struct xen_domctl_getdomaininfo { uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ uint64_aligned_t cpu_time; uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ +#define XEN_INVALID_MAX_VCPU_ID (~0U) /* Domain has no vcpus? */ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ uint32_t ssidref; xen_domain_handle_t handle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCf0-0008P9-Rb; Fri, 14 Nov 2014 08:55:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCez-0008Op-Ia for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:17 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 4F/2E-17694-473C5645; Fri, 14 Nov 2014 08:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1415955314!11334813!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17558 invoked from network); 14 Nov 2014 08:55:16 -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 2014 08:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCew-0004Sp-Gi for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCew-000290-Bl for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:14 +0000 Date: Fri, 14 Nov 2014 08:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] vmx: fix save/restore issue with apicv X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81b9db19fa454dc5e723d712d8800e865b0f24e5 Author: Yang Zhang AuthorDate: Thu Nov 13 09:43:33 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:43:33 2014 +0100 vmx: fix save/restore issue with apicv This patch fixes two issues: 1. Interrupts on PIR are lost during save/restore. Syncing the PIR into IRR during save will fix it. 2. EOI exit bitmap doesn't set up correctly after restore. Here we will construct the eoi exit bitmap via (IRR | ISR). Though it may cause unnecessary eoi exit of the interrupts that pending in IRR or ISR during save/restore, each pending interrupt only causes one vmexit. The subsequent interrupts will adjust the eoi exit bitmap correctly. So the performance hurt can be ignored. Signed-off-by: Yang Zhang Signed-off-by: Olaf Hering Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 607e8494c42397fb249191904066cace6ac9a880 master date: 2014-10-27 16:40:18 +0100 --- xen/arch/x86/hvm/vlapic.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 24 ++++++++++++++++++++++++ xen/include/asm-x86/hvm/vlapic.h | 2 ++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index bc06010..bd8c63e 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1161,6 +1161,9 @@ static int lapic_save_regs(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + if ( hvm_funcs.sync_pir_to_irr ) + hvm_funcs.sync_pir_to_irr(v); + s = vcpu_vlapic(v); if ( (rc = hvm_save_entry(LAPIC_REGS, v->vcpu_id, h, s->regs)) != 0 ) break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index b05c88e..a6a850d 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1530,6 +1530,8 @@ static void vmx_process_isr(int isr, struct vcpu *v) { unsigned long status; u8 old; + unsigned int i; + const struct vlapic *vlapic = vcpu_vlapic(v); if ( isr < 0 ) isr = 0; @@ -1543,6 +1545,28 @@ static void vmx_process_isr(int isr, struct vcpu *v) status |= isr << VMX_GUEST_INTR_STATUS_SVI_OFFSET; __vmwrite(GUEST_INTR_STATUS, status); } + + /* + * Theoretically, only level triggered interrupts can have their + * corresponding bits set in the eoi exit bitmap. That is, the bits + * set in the eoi exit bitmap should also be set in TMR. But a periodic + * timer interrupt does not follow the rule: it is edge triggered, but + * requires its corresponding bit be set in the eoi exit bitmap. So we + * should not construct the eoi exit bitmap based on TMR. + * Here we will construct the eoi exit bitmap via (IRR | ISR). This + * means that EOIs to the interrupts that are set in the IRR or ISR will + * cause VM exits after restoring, regardless of the trigger modes. It + * is acceptable because the subsequent interrupts will set up the eoi + * bitmap correctly. + */ + for ( i = 0x10; i < NR_VECTORS; ++i ) + if ( vlapic_test_vector(i, &vlapic->regs->data[APIC_IRR]) || + vlapic_test_vector(i, &vlapic->regs->data[APIC_ISR]) ) + set_bit(i, v->arch.hvm_vmx.eoi_exit_bitmap); + + for ( i = 0; i < ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); ++i ) + __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm_vmx.eoi_exit_bitmap[i]); + vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index 66f0aff..2994920 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -58,6 +58,8 @@ #define VEC_POS(v) ((v) % 32) #define REG_POS(v) (((v) / 32) * 0x10) +#define vlapic_test_vector(vec, bitmap) \ + test_bit(VEC_POS(vec), (const uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_set_vector(vec, bitmap) \ test_and_set_bit(VEC_POS(vec), (uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_clear_vector(vec, bitmap) \ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCeq-0008Ni-N8; Fri, 14 Nov 2014 08:55:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCep-0008NT-9H for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:07 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 58/F6-25547-A63C5645; Fri, 14 Nov 2014 08:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1415955304!11296732!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22945 invoked from network); 14 Nov 2014 08:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCem-0004Sm-6x for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCel-00028Q-PL for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:03 +0000 Date: Fri, 14 Nov 2014 08:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] fix listing of vcpus when domains lacking any vcpus exist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a934e1551268edc5cddee297cf27e3f757198740 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:42:03 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:42:03 2014 +0100 fix listing of vcpus when domains lacking any vcpus exist On a system which looks like this: [root@st04 ~]# xl list Name ID Mem VCPUs State Time(s) Domain-0 0 752 4 r----- 46699.3 (null) 1 0 0 --p--- 0.0 (null) 2 0 0 --p--- 0.0 (null) 3 0 0 --p--- 0.0 badger 25 0 1 --p--- 0.0 `xl vcpu-list` failes as so: [root@st04 ~]# xl vcpu-list Name ID VCPU CPU State Time(s) CPU Affinity Domain-0 0 0 0 -b- 12171.0 all Domain-0 0 1 1 -b- 11779.6 all Domain-0 0 2 2 -b- 11599.0 all Domain-0 0 3 3 r-- 11007.0 all libxl: critical: libxl__calloc: libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) : Cannot allocate memory libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) The root cause of this is in Xen. getdomaininfo() has no way of expressing "this domain has no vcpus". Previously, info->max_vcpu_id would be returned uninitialised in such a case. Unfortunately, setting it to 0 as a default is not appropriate. A max_vcpu_id of 0 and nr_online_cpus of 0 is the valid state for a single vcpu domain which is in the process of being destroyed. As all components are required to add 1 to max_vcpu_id to get the number of vcpus, an id of ~0U is not valid to be used. Explicitly define this as an invalid max vcpu value, and use it to express "no vcpus" in getdomaininfo() In libxl, the issue is seen as libxl_list_vcpu() attempts to use the uninitialised domaininfo.max_vcpu_id for memory allocation. Check domaininfo.max_vcpu_id against the new sentinel value XEN_INVALID_MAX_VCPU_ID, and return early. This means that it is now valid for libxl_list_vcpu() to return NULL for a domain which lacks any vcpus. As part of this change, remove the pointless call to libxl_get_max_cpus(), whose returned value is unconditionally clobbered in the for() loop. Reported-by: Euan Harris Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Don Slutz Acked-by: Ian Campbell tools/libxl: Fix libxl_list_vcpu() following c/s 93e52d52 My reasoning regarding nr_cpus_out was wrong, as I had confused nr_cpus_out with nr_vcpus_out. Dario pointed this out, but the patch (having gained appropriate acks) got committed before I could post a correction. Noticed-by: Dario Faggioli Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell master commit: 93e52d5242804ff928131553599afa769f85481b master date: 2014-10-23 10:19:53 +0200 master commit: c90a755f261b8ccb3dac7e1f695122cac95c6053 master date: 2014-10-23 12:29:00 +0100 --- tools/libxl/libxl.c | 6 ++++++ tools/libxl/xl_cmdimpl.c | 4 +--- xen/common/domctl.c | 1 + xen/include/public/domctl.h | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2d29ad2..0e41739 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4551,6 +4551,12 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, GC_FREE; return NULL; } + + if (domaininfo.max_vcpu_id == XEN_INVALID_MAX_VCPU_ID) { + GC_FREE; + return NULL; + } + *nr_cpus_out = libxl_get_max_cpus(ctx); ret = ptr = libxl__calloc(NOGC, domaininfo.max_vcpu_id + 1, sizeof(libxl_vcpuinfo)); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4fc46eb..d1c45e4 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4580,10 +4580,8 @@ static void print_domain_vcpuinfo(uint32_t domid, uint32_t nr_cpus) vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nrcpus); - if (!vcpuinfo) { - fprintf(stderr, "libxl_list_vcpu failed.\n"); + if (!vcpuinfo) return; - } for (i = 0; i < nb_vcpu; i++) { print_vcpuinfo(domid, &vcpuinfo[i], nr_cpus); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 060af1b..3a55883 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -154,6 +154,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) struct vcpu_runstate_info runstate; info->domain = d->domain_id; + info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; info->nr_online_vcpus = 0; info->ssidref = 0; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index f22fe2e..7e0b517 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -107,6 +107,7 @@ struct xen_domctl_getdomaininfo { uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ uint64_aligned_t cpu_time; uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ +#define XEN_INVALID_MAX_VCPU_ID (~0U) /* Domain has no vcpus? */ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ uint32_t ssidref; xen_domain_handle_t handle; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfA-0008Qz-UI; Fri, 14 Nov 2014 08:55:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCf9-0008QL-Kf for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:27 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id FD/58-26652-E73C5645; Fri, 14 Nov 2014 08:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1415955325!11331389!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21468 invoked from network); 14 Nov 2014 08:55:26 -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; 14 Nov 2014 08:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCf6-0004Ss-Tm for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCf6-00029M-KO for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:24 +0000 Date: Fri, 14 Nov 2014 08:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] hvm/load: correct length checks for zeroextended records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 90306bed18c942b2892fb27d46e386d402efc066 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:44:26 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:44:26 2014 +0100 hvm/load: correct length checks for zeroextended records In the case that Xen is attempting to load a zeroextended HVM record where the difference needing extending would overflow the data blob, _hvm_check_entry() will incorrectly fail before working out that it would have been safe. The "len + sizeof(*d)" check is wrong. Consider zeroextending a 16 byte record into a 32 byte structure. "32 + hdr" will fail the overall context length check even though the pre-extended record in the stream is 16 bytes. The first condition is reduced to just a length check for hvm save header, while the second condition is extended to include a check that the record in the stream not exceeding the stream length. The error messages are extended to include further useful information. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Reviewed-by: Jan Beulich master commit: 66d0c0aa1f3e57e873fd64d1d370e11758d25442 master date: 2014-10-27 16:41:50 +0100 --- xen/common/hvm/save.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/common/hvm/save.c b/xen/common/hvm/save.c index 6c16399..da6e668 100644 --- a/xen/common/hvm/save.c +++ b/xen/common/hvm/save.c @@ -292,19 +292,22 @@ int _hvm_check_entry(struct hvm_domain_context *h, { struct hvm_save_descriptor *d = (struct hvm_save_descriptor *)&h->data[h->cur]; - if ( len + sizeof (*d) > h->size - h->cur) + if ( sizeof(*d) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM restore: not enough data left to read %u bytes " - "for type %u\n", len, type); + "HVM restore: not enough data left to read %zu bytes " + "for type %u header\n", sizeof(*d), type); return -1; - } - if ( (type != d->typecode) || (len < d->length) || - (strict_length && (len != d->length)) ) + } + if ( (type != d->typecode) || + (strict_length ? (len != d->length) : (len < d->length)) || + (d->length > (h->size - h->cur - sizeof(*d))) ) { printk(XENLOG_G_WARNING - "HVM restore mismatch: expected type %u length %u, " - "saw type %u length %u\n", type, len, d->typecode, d->length); + "HVM restore mismatch: expected %s type %u length %u, " + "saw type %u length %u. %zu bytes remaining\n", + strict_length ? "strict" : "zeroextended", type, len, + d->typecode, d->length, h->size - h->cur - sizeof(*d)); return -1; } h->cur += sizeof(*d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfA-0008Qz-UI; Fri, 14 Nov 2014 08:55:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCf9-0008QL-Kf for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:27 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id FD/58-26652-E73C5645; Fri, 14 Nov 2014 08:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1415955325!11331389!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21468 invoked from network); 14 Nov 2014 08:55:26 -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; 14 Nov 2014 08:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCf6-0004Ss-Tm for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCf6-00029M-KO for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:24 +0000 Date: Fri, 14 Nov 2014 08:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] hvm/load: correct length checks for zeroextended records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 90306bed18c942b2892fb27d46e386d402efc066 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:44:26 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:44:26 2014 +0100 hvm/load: correct length checks for zeroextended records In the case that Xen is attempting to load a zeroextended HVM record where the difference needing extending would overflow the data blob, _hvm_check_entry() will incorrectly fail before working out that it would have been safe. The "len + sizeof(*d)" check is wrong. Consider zeroextending a 16 byte record into a 32 byte structure. "32 + hdr" will fail the overall context length check even though the pre-extended record in the stream is 16 bytes. The first condition is reduced to just a length check for hvm save header, while the second condition is extended to include a check that the record in the stream not exceeding the stream length. The error messages are extended to include further useful information. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Reviewed-by: Jan Beulich master commit: 66d0c0aa1f3e57e873fd64d1d370e11758d25442 master date: 2014-10-27 16:41:50 +0100 --- xen/common/hvm/save.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/common/hvm/save.c b/xen/common/hvm/save.c index 6c16399..da6e668 100644 --- a/xen/common/hvm/save.c +++ b/xen/common/hvm/save.c @@ -292,19 +292,22 @@ int _hvm_check_entry(struct hvm_domain_context *h, { struct hvm_save_descriptor *d = (struct hvm_save_descriptor *)&h->data[h->cur]; - if ( len + sizeof (*d) > h->size - h->cur) + if ( sizeof(*d) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM restore: not enough data left to read %u bytes " - "for type %u\n", len, type); + "HVM restore: not enough data left to read %zu bytes " + "for type %u header\n", sizeof(*d), type); return -1; - } - if ( (type != d->typecode) || (len < d->length) || - (strict_length && (len != d->length)) ) + } + if ( (type != d->typecode) || + (strict_length ? (len != d->length) : (len < d->length)) || + (d->length > (h->size - h->cur - sizeof(*d))) ) { printk(XENLOG_G_WARNING - "HVM restore mismatch: expected type %u length %u, " - "saw type %u length %u\n", type, len, d->typecode, d->length); + "HVM restore mismatch: expected %s type %u length %u, " + "saw type %u length %u. %zu bytes remaining\n", + strict_length ? "strict" : "zeroextended", type, len, + d->typecode, d->length, h->size - h->cur - sizeof(*d)); return -1; } h->cur += sizeof(*d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08: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 1XpCfL-0008Te-6O; Fri, 14 Nov 2014 08: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 1XpCfK-0008TL-9C for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:38 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 54/92-11608-983C5645; Fri, 14 Nov 2014 08:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1415955335!11296873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27607 invoked from network); 14 Nov 2014 08:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfH-0004T6-4x for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfH-00029m-0v for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:35 +0000 Date: Fri, 14 Nov 2014 08:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: tolerate running on EFI runtime services page tables in map_domain_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 62569eb8ce837cb548410b94bf2f8c16f3d0d2c9 Author: Jan Beulich AuthorDate: Thu Nov 13 09:45:42 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:45:42 2014 +0100 x86: tolerate running on EFI runtime services page tables in map_domain_page() In the event of a #PF while in an EFI runtime service function we otherwise can't dump the page tables, making the analysis of the problem more cumbersome. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: e65436ba36be8f1b735573d8fc9af7d8a053ba5f master date: 2014-10-27 16:43:12 +0100 --- xen/arch/x86/domain_page.c | 6 +++++- xen/arch/x86/efi/runtime.c | 5 +++++ xen/arch/x86/efi/stub.c | 6 ++++++ xen/include/xen/efi.h | 1 + 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 3903952..158a164 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -37,11 +38,14 @@ static inline struct vcpu *mapcache_current_vcpu(void) */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { + unsigned long cr3; + /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT(read_cr3() == __pa(idle_pg_table)); + ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || + (efi_enabled && cr3 == efi_rs_page_table())); } return v; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 166852d..1a57526 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -93,6 +93,11 @@ void efi_rs_leave(unsigned long cr3) stts(); } +paddr_t efi_rs_page_table(void) +{ + return virt_to_maddr(efi_l4_pgtable); +} + unsigned long efi_get_time(void) { EFI_TIME time; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 8916a2e..b8f49f8 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -9,6 +9,12 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +paddr_t efi_rs_page_table(void) +{ + BUG(); + return 0; +} + unsigned long efi_get_time(void) { BUG(); diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 8a2b788..5e02724 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,6 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); +paddr_t efi_rs_page_table(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08: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 1XpCfL-0008Te-6O; Fri, 14 Nov 2014 08: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 1XpCfK-0008TL-9C for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:38 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 54/92-11608-983C5645; Fri, 14 Nov 2014 08:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1415955335!11296873!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27607 invoked from network); 14 Nov 2014 08:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfH-0004T6-4x for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfH-00029m-0v for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:35 +0000 Date: Fri, 14 Nov 2014 08:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: tolerate running on EFI runtime services page tables in map_domain_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 62569eb8ce837cb548410b94bf2f8c16f3d0d2c9 Author: Jan Beulich AuthorDate: Thu Nov 13 09:45:42 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:45:42 2014 +0100 x86: tolerate running on EFI runtime services page tables in map_domain_page() In the event of a #PF while in an EFI runtime service function we otherwise can't dump the page tables, making the analysis of the problem more cumbersome. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: e65436ba36be8f1b735573d8fc9af7d8a053ba5f master date: 2014-10-27 16:43:12 +0100 --- xen/arch/x86/domain_page.c | 6 +++++- xen/arch/x86/efi/runtime.c | 5 +++++ xen/arch/x86/efi/stub.c | 6 ++++++ xen/include/xen/efi.h | 1 + 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 3903952..158a164 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -37,11 +38,14 @@ static inline struct vcpu *mapcache_current_vcpu(void) */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && is_pv_vcpu(v) ) { + unsigned long cr3; + /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT(read_cr3() == __pa(idle_pg_table)); + ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || + (efi_enabled && cr3 == efi_rs_page_table())); } return v; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 166852d..1a57526 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -93,6 +93,11 @@ void efi_rs_leave(unsigned long cr3) stts(); } +paddr_t efi_rs_page_table(void) +{ + return virt_to_maddr(efi_l4_pgtable); +} + unsigned long efi_get_time(void) { EFI_TIME time; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 8916a2e..b8f49f8 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -9,6 +9,12 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +paddr_t efi_rs_page_table(void) +{ + BUG(); + return 0; +} + unsigned long efi_get_time(void) { BUG(); diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 8a2b788..5e02724 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,6 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); +paddr_t efi_rs_page_table(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08: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 1XpCfV-0008WA-D1; Fri, 14 Nov 2014 08:55:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfU-0008Vi-0p for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:48 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 9B/01-09842-393C5645; Fri, 14 Nov 2014 08:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1415955345!12676568!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2940 invoked from network); 14 Nov 2014 08:55:46 -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 2014 08:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfR-0004TC-AV for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfR-0002Ar-8q for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:45 +0000 Date: Fri, 14 Nov 2014 08:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: allow to suppress the use of runtime services X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 267d6b3244d88acf0b9a7c60a6a980b3e0a553e6 Author: Jan Beulich AuthorDate: Thu Nov 13 09:46:46 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:46:46 2014 +0100 EFI: allow to suppress the use of runtime services On certain systems some of the memory map entries designated for use by runtime services cannot be mapped (frequently due to firmware bugs). On others, some of the memory map entries aren't even marked for runtime services use, yet are being used by them. For both cases give people a way to suppress use of runtime services altogether. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 5680244040d26234a43c7f884ecf98fa4928d0da master date: 2014-10-27 16:43:52 +0100 --- docs/misc/xen-command-line.markdown | 7 +++ xen/arch/x86/efi/boot.c | 12 +++++- xen/arch/x86/efi/runtime.c | 86 +++++++++++++++++++++++++--------- 3 files changed, 81 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 43f6fdd..e2cd3e3 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -497,6 +497,13 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. +### efi-rs +> `= ` + +> Default: `true` + +Force or disable use of EFI runtime services. + ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 7044892..a14d1b1 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1497,6 +1497,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } + +static bool_t __initdata efi_rs_enable = 1; +boolean_param("efi-rs", efi_rs_enable); + #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, @@ -1570,7 +1574,7 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1634,6 +1638,12 @@ void __init efi_init_memory(void) } } + if ( !efi_rs_enable ) + { + efi_fw_vendor = NULL; + return; + } + #ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 1a57526..ff6a49c 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -51,6 +51,9 @@ unsigned long efi_rs_enter(void) static const u32 mxcsr = MXCSR_DEFAULT; unsigned long cr3 = read_cr3(); + if ( !efi_l4_pgtable ) + return 0; + save_fpu_enable(); asm volatile ( "fldcw %0" :: "m" (fcw) ); asm volatile ( "ldmxcsr %0" :: "m" (mxcsr) ); @@ -78,6 +81,8 @@ unsigned long efi_rs_enter(void) void efi_rs_leave(unsigned long cr3) { + if ( !cr3 ) + return; write_cr3(cr3); if ( is_pv_vcpu(current) && !is_idle_vcpu(current) ) { @@ -95,7 +100,7 @@ void efi_rs_leave(unsigned long cr3) paddr_t efi_rs_page_table(void) { - return virt_to_maddr(efi_l4_pgtable); + return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; } unsigned long efi_get_time(void) @@ -104,6 +109,8 @@ unsigned long efi_get_time(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(), flags; + if ( !cr3 ) + return 0; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(&time, NULL); spin_unlock_irqrestore(&rtc_lock, flags); @@ -121,6 +128,8 @@ void efi_halt_system(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -132,6 +141,8 @@ void efi_reset_system(bool_t warm) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(warm ? EfiResetWarm : EfiResetCold, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -154,6 +165,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) { unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; info->version = efi_rs->Hdr.Revision; efi_rs_leave(cr3); break; @@ -163,6 +176,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) info->cfg.nent = efi_num_ct; break; case XEN_FW_EFI_VENDOR: + if ( !efi_fw_vendor ) + return -EOPNOTSUPP; info->vendor.revision = efi_fw_revision; n = info->vendor.bufsz / sizeof(*efi_fw_vendor); if ( !guest_handle_okay(guest_handle_cast(info->vendor.name, @@ -285,6 +300,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(cast_time(&op->u.get_time.time), &caps); spin_unlock_irqrestore(&rtc_lock, flags); @@ -305,6 +322,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetTime(cast_time(&op->u.set_time)); spin_unlock_irqrestore(&rtc_lock, flags); @@ -319,6 +338,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetWakeupTime(&enabled, &pending, cast_time(&op->u.get_wakeup_time)); @@ -341,6 +362,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetWakeupTime(!!(op->misc & XEN_EFI_SET_WAKEUP_TIME_ENABLE), @@ -359,7 +382,10 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - status = efi_rs->GetNextHighMonotonicCount(&op->misc); + if ( cr3 ) + status = efi_rs->GetNextHighMonotonicCount(&op->misc); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); break; @@ -395,15 +421,20 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) data = NULL; cr3 = efi_rs_enter(); - status = efi_rs->GetVariable( - name, cast_guid(&op->u.get_variable.vendor_guid), - &op->misc, &size, data); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetVariable( + name, cast_guid(&op->u.get_variable.vendor_guid), + &op->misc, &size, data); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_variable.data, data, size) ) - rc = -EFAULT; - op->u.get_variable.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_variable.data, data, size) ) + rc = -EFAULT; + op->u.get_variable.size = size; + } + else + rc = -EOPNOTSUPP; xfree(data); xfree(name); @@ -433,9 +464,12 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) else { cr3 = efi_rs_enter(); - status = efi_rs->SetVariable( - name, cast_guid(&op->u.set_variable.vendor_guid), - op->misc, op->u.set_variable.size, data); + if ( cr3 ) + status = efi_rs->SetVariable( + name, cast_guid(&op->u.set_variable.vendor_guid), + op->misc, op->u.set_variable.size, data); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); } @@ -467,15 +501,21 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - status = efi_rs->GetNextVariableName( - &size, name.str, - cast_guid(&op->u.get_next_variable_name.vendor_guid)); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetNextVariableName( + &size, name.str, + cast_guid(&op->u.get_next_variable_name.vendor_guid)); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, name.raw, size) ) - rc = -EFAULT; - op->u.get_next_variable_name.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_next_variable_name.name, + name.raw, size) ) + rc = -EFAULT; + op->u.get_next_variable_name.size = size; + } + else + rc = -EOPNOTSUPP; xfree(name.raw); } @@ -512,7 +552,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; @@ -531,7 +571,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08: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 1XpCfV-0008WA-D1; Fri, 14 Nov 2014 08:55:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfU-0008Vi-0p for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:48 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 9B/01-09842-393C5645; Fri, 14 Nov 2014 08:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1415955345!12676568!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2940 invoked from network); 14 Nov 2014 08:55:46 -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 2014 08:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfR-0004TC-AV for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfR-0002Ar-8q for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:45 +0000 Date: Fri, 14 Nov 2014 08:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: allow to suppress the use of runtime services X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 267d6b3244d88acf0b9a7c60a6a980b3e0a553e6 Author: Jan Beulich AuthorDate: Thu Nov 13 09:46:46 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:46:46 2014 +0100 EFI: allow to suppress the use of runtime services On certain systems some of the memory map entries designated for use by runtime services cannot be mapped (frequently due to firmware bugs). On others, some of the memory map entries aren't even marked for runtime services use, yet are being used by them. For both cases give people a way to suppress use of runtime services altogether. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 5680244040d26234a43c7f884ecf98fa4928d0da master date: 2014-10-27 16:43:52 +0100 --- docs/misc/xen-command-line.markdown | 7 +++ xen/arch/x86/efi/boot.c | 12 +++++- xen/arch/x86/efi/runtime.c | 86 +++++++++++++++++++++++++--------- 3 files changed, 81 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 43f6fdd..e2cd3e3 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -497,6 +497,13 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. +### efi-rs +> `= ` + +> Default: `true` + +Force or disable use of EFI runtime services. + ### extra\_guest\_irqs > `= [][,]` diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 7044892..a14d1b1 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1497,6 +1497,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } + +static bool_t __initdata efi_rs_enable = 1; +boolean_param("efi-rs", efi_rs_enable); + #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, @@ -1570,7 +1574,7 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1634,6 +1638,12 @@ void __init efi_init_memory(void) } } + if ( !efi_rs_enable ) + { + efi_fw_vendor = NULL; + return; + } + #ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index 1a57526..ff6a49c 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -51,6 +51,9 @@ unsigned long efi_rs_enter(void) static const u32 mxcsr = MXCSR_DEFAULT; unsigned long cr3 = read_cr3(); + if ( !efi_l4_pgtable ) + return 0; + save_fpu_enable(); asm volatile ( "fldcw %0" :: "m" (fcw) ); asm volatile ( "ldmxcsr %0" :: "m" (mxcsr) ); @@ -78,6 +81,8 @@ unsigned long efi_rs_enter(void) void efi_rs_leave(unsigned long cr3) { + if ( !cr3 ) + return; write_cr3(cr3); if ( is_pv_vcpu(current) && !is_idle_vcpu(current) ) { @@ -95,7 +100,7 @@ void efi_rs_leave(unsigned long cr3) paddr_t efi_rs_page_table(void) { - return virt_to_maddr(efi_l4_pgtable); + return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; } unsigned long efi_get_time(void) @@ -104,6 +109,8 @@ unsigned long efi_get_time(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(), flags; + if ( !cr3 ) + return 0; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(&time, NULL); spin_unlock_irqrestore(&rtc_lock, flags); @@ -121,6 +128,8 @@ void efi_halt_system(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -132,6 +141,8 @@ void efi_reset_system(bool_t warm) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(warm ? EfiResetWarm : EfiResetCold, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -154,6 +165,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) { unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; info->version = efi_rs->Hdr.Revision; efi_rs_leave(cr3); break; @@ -163,6 +176,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) info->cfg.nent = efi_num_ct; break; case XEN_FW_EFI_VENDOR: + if ( !efi_fw_vendor ) + return -EOPNOTSUPP; info->vendor.revision = efi_fw_revision; n = info->vendor.bufsz / sizeof(*efi_fw_vendor); if ( !guest_handle_okay(guest_handle_cast(info->vendor.name, @@ -285,6 +300,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(cast_time(&op->u.get_time.time), &caps); spin_unlock_irqrestore(&rtc_lock, flags); @@ -305,6 +322,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetTime(cast_time(&op->u.set_time)); spin_unlock_irqrestore(&rtc_lock, flags); @@ -319,6 +338,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetWakeupTime(&enabled, &pending, cast_time(&op->u.get_wakeup_time)); @@ -341,6 +362,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetWakeupTime(!!(op->misc & XEN_EFI_SET_WAKEUP_TIME_ENABLE), @@ -359,7 +382,10 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - status = efi_rs->GetNextHighMonotonicCount(&op->misc); + if ( cr3 ) + status = efi_rs->GetNextHighMonotonicCount(&op->misc); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); break; @@ -395,15 +421,20 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) data = NULL; cr3 = efi_rs_enter(); - status = efi_rs->GetVariable( - name, cast_guid(&op->u.get_variable.vendor_guid), - &op->misc, &size, data); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetVariable( + name, cast_guid(&op->u.get_variable.vendor_guid), + &op->misc, &size, data); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_variable.data, data, size) ) - rc = -EFAULT; - op->u.get_variable.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_variable.data, data, size) ) + rc = -EFAULT; + op->u.get_variable.size = size; + } + else + rc = -EOPNOTSUPP; xfree(data); xfree(name); @@ -433,9 +464,12 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) else { cr3 = efi_rs_enter(); - status = efi_rs->SetVariable( - name, cast_guid(&op->u.set_variable.vendor_guid), - op->misc, op->u.set_variable.size, data); + if ( cr3 ) + status = efi_rs->SetVariable( + name, cast_guid(&op->u.set_variable.vendor_guid), + op->misc, op->u.set_variable.size, data); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); } @@ -467,15 +501,21 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - status = efi_rs->GetNextVariableName( - &size, name.str, - cast_guid(&op->u.get_next_variable_name.vendor_guid)); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetNextVariableName( + &size, name.str, + cast_guid(&op->u.get_next_variable_name.vendor_guid)); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, name.raw, size) ) - rc = -EFAULT; - op->u.get_next_variable_name.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_next_variable_name.name, + name.raw, size) ) + rc = -EFAULT; + op->u.get_next_variable_name.size = size; + } + else + rc = -EOPNOTSUPP; xfree(name.raw); } @@ -512,7 +552,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; @@ -531,7 +571,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55: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 1XpCff-00006r-GB; Fri, 14 Nov 2014 08: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 1XpCfe-00006V-9a for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E4/A3-02702-D93C5645; Fri, 14 Nov 2014 08:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1415955355!12514227!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8439 invoked from network); 14 Nov 2014 08:55:56 -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; 14 Nov 2014 08:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfb-0004TL-GZ for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfb-0002BD-Ef for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:55 +0000 Date: Fri, 14 Nov 2014 08:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12e92e613b4985270c21da6b90183ac9330fb645 Author: Don Koch AuthorDate: Thu Nov 13 09:47:30 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:47:30 2014 +0100 x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions Xen 4.3.0, 4.2.3 and older transferred a maximum sized xsave area (as if all the available XCR0 bits were set); the new version only transfers based on the actual XCR0 bits. This may result in a smaller area if the last sections were missing (e.g., the LWP area from an AMD machine). If the size doesn't match the XCR0 derived size, the size is checked against the maximum size and the part of the xsave area between the actual and maximum used size is checked for zero data. If either the max size check or any part of the overflow area is non-zero, we return with an error. Signed-off-by: Don Koch Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: d7bb8e88a087690feba63ef83c13ba067f041da0 master date: 2014-10-27 16:45:09 +0100 --- xen/arch/x86/hvm/hvm.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0c04972..b004b74 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1041,6 +1041,7 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; + unsigned int i, desc_start; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1081,15 +1082,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) save_area) + XSTATE_AREA_MIN_SIZE); return -EINVAL; } - size = HVM_CPU_XSAVE_SIZE(xfeature_mask); - if ( desc->length > size ) - { - printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", - d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; - } h->cur += sizeof (*desc); + desc_start = h->cur; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; @@ -1109,10 +1103,24 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); if ( desc->length > size ) { + /* + * Xen 4.3.0, 4.2.3 and older used to send longer-than-needed + * xsave regions. Permit loading the record if the extra data + * is all zero. + */ + for ( i = size; i < desc->length; i++ ) + { + if ( h->data[desc_start + i] ) + { + printk(XENLOG_G_WARNING + "HVM%d.%u restore mismatch: xsave length %#x > %#x (non-zero data at %#x)\n", + d->domain_id, vcpuid, desc->length, size, i); + return -EOPNOTSUPP; + } + } printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", + "HVM%d.%u restore mismatch: xsave length %#x > %#x\n", d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; } /* Checking finished */ @@ -1121,7 +1129,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) 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)); + min(desc->length, size) - offsetof(struct hvm_hw_cpu_xsave, + save_area)); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:55: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 1XpCff-00006r-GB; Fri, 14 Nov 2014 08: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 1XpCfe-00006V-9a for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E4/A3-02702-D93C5645; Fri, 14 Nov 2014 08:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1415955355!12514227!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8439 invoked from network); 14 Nov 2014 08:55:56 -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; 14 Nov 2014 08:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfb-0004TL-GZ for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfb-0002BD-Ef for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:55:55 +0000 Date: Fri, 14 Nov 2014 08:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12e92e613b4985270c21da6b90183ac9330fb645 Author: Don Koch AuthorDate: Thu Nov 13 09:47:30 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:47:30 2014 +0100 x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions Xen 4.3.0, 4.2.3 and older transferred a maximum sized xsave area (as if all the available XCR0 bits were set); the new version only transfers based on the actual XCR0 bits. This may result in a smaller area if the last sections were missing (e.g., the LWP area from an AMD machine). If the size doesn't match the XCR0 derived size, the size is checked against the maximum size and the part of the xsave area between the actual and maximum used size is checked for zero data. If either the max size check or any part of the overflow area is non-zero, we return with an error. Signed-off-by: Don Koch Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: d7bb8e88a087690feba63ef83c13ba067f041da0 master date: 2014-10-27 16:45:09 +0100 --- xen/arch/x86/hvm/hvm.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0c04972..b004b74 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1041,6 +1041,7 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; + unsigned int i, desc_start; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1081,15 +1082,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) save_area) + XSTATE_AREA_MIN_SIZE); return -EINVAL; } - size = HVM_CPU_XSAVE_SIZE(xfeature_mask); - if ( desc->length > size ) - { - printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", - d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; - } h->cur += sizeof (*desc); + desc_start = h->cur; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; @@ -1109,10 +1103,24 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); if ( desc->length > size ) { + /* + * Xen 4.3.0, 4.2.3 and older used to send longer-than-needed + * xsave regions. Permit loading the record if the extra data + * is all zero. + */ + for ( i = size; i < desc->length; i++ ) + { + if ( h->data[desc_start + i] ) + { + printk(XENLOG_G_WARNING + "HVM%d.%u restore mismatch: xsave length %#x > %#x (non-zero data at %#x)\n", + d->domain_id, vcpuid, desc->length, size, i); + return -EOPNOTSUPP; + } + } printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", + "HVM%d.%u restore mismatch: xsave length %#x > %#x\n", d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; } /* Checking finished */ @@ -1121,7 +1129,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) 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)); + min(desc->length, size) - offsetof(struct hvm_hw_cpu_xsave, + save_area)); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56: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 1XpCfq-000094-Ik; Fri, 14 Nov 2014 08:56:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfp-00008n-H5 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:09 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 92/B8-11581-8A3C5645; Fri, 14 Nov 2014 08:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1415955365!8458408!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14473 invoked from network); 14 Nov 2014 08:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfl-0004Tt-ME for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfl-0002Gs-KJ for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:05 +0000 Date: Fri, 14 Nov 2014 08:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1f3425ab78fea3122c94d90cc6487381a1dc771 Author: Jan Beulich AuthorDate: Thu Nov 13 09:48:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:48:13 2014 +0100 VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical A recent KVM change by Nadav Amit helped spot that we have the same issue as they did. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 93cc5c6f1641e90eb120826d42f103b7726efb8e master date: 2014-10-31 11:31:11 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a6a850d..d56e5ff 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2184,9 +2184,13 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) __vmwrite(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56: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 1XpCfq-000094-Ik; Fri, 14 Nov 2014 08:56:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfp-00008n-H5 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:09 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 92/B8-11581-8A3C5645; Fri, 14 Nov 2014 08:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1415955365!8458408!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14473 invoked from network); 14 Nov 2014 08:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfl-0004Tt-ME for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfl-0002Gs-KJ for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:05 +0000 Date: Fri, 14 Nov 2014 08:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f1f3425ab78fea3122c94d90cc6487381a1dc771 Author: Jan Beulich AuthorDate: Thu Nov 13 09:48:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:48:13 2014 +0100 VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical A recent KVM change by Nadav Amit helped spot that we have the same issue as they did. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 93cc5c6f1641e90eb120826d42f103b7726efb8e master date: 2014-10-31 11:31:11 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a6a850d..d56e5ff 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2184,9 +2184,13 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) __vmwrite(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfz-0000Al-LM; Fri, 14 Nov 2014 08:56:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfy-0000AQ-6P for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:18 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 5A/E8-24532-1B3C5645; Fri, 14 Nov 2014 08:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1415955376!5404347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20769 invoked from network); 14 Nov 2014 08:56:16 -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; 14 Nov 2014 08:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfv-0004Tz-SK for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfv-0002HM-Qi for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:15 +0000 Date: Fri, 14 Nov 2014 08:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: only kill guest when unknown VM exit occurred in guest kernel 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 0188b50437ce4c433c1024b16d87339e4ab6eeed Author: Jan Beulich AuthorDate: Thu Nov 13 09:48:55 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:48:55 2014 +0100 x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode A recent KVM change by Nadav Amit pointed out that unconditional VM exits (like VMX'es ones for the INVEPT, INVVPID, and XSETBV instructions) may result from guest user mode activity (in the example cases, e.g. prior to a privilege level check being done). Consequently convert the unconditional domain_crash() to a conditional one (when guest is in kernel mode) with the alternative of injecting #UD (when in user mode). This is meant to be a precaution against in-guest security issues introduced when any such VM exit becomes possible (on newer hardware) without the hypervisor immediately being aware of it. There are no such unhandled VM exits currently (and hence this is not an active security issue), but old (no longer security maintained) versions exhibit issues in the cases given as examples above. Suggested-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian master commit: 5283b310e14884341f51be35253cdd59c4cb034c master date: 2014-10-31 11:32:27 +0100 --- xen/arch/x86/hvm/svm/svm.c | 6 +++++- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 3f274f0..cb8f44f 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2460,7 +2460,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - domain_crash(v->domain); + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d56e5ff..1309c44 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3029,8 +3029,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#lx)\n", exit_reason); - domain_crash(v->domain); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfz-0000Al-LM; Fri, 14 Nov 2014 08:56:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfy-0000AQ-6P for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:18 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 5A/E8-24532-1B3C5645; Fri, 14 Nov 2014 08:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1415955376!5404347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20769 invoked from network); 14 Nov 2014 08:56:16 -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; 14 Nov 2014 08:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCfv-0004Tz-SK for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCfv-0002HM-Qi for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:15 +0000 Date: Fri, 14 Nov 2014 08:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: only kill guest when unknown VM exit occurred in guest kernel 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 0188b50437ce4c433c1024b16d87339e4ab6eeed Author: Jan Beulich AuthorDate: Thu Nov 13 09:48:55 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:48:55 2014 +0100 x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode A recent KVM change by Nadav Amit pointed out that unconditional VM exits (like VMX'es ones for the INVEPT, INVVPID, and XSETBV instructions) may result from guest user mode activity (in the example cases, e.g. prior to a privilege level check being done). Consequently convert the unconditional domain_crash() to a conditional one (when guest is in kernel mode) with the alternative of injecting #UD (when in user mode). This is meant to be a precaution against in-guest security issues introduced when any such VM exit becomes possible (on newer hardware) without the hypervisor immediately being aware of it. There are no such unhandled VM exits currently (and hence this is not an active security issue), but old (no longer security maintained) versions exhibit issues in the cases given as examples above. Suggested-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian master commit: 5283b310e14884341f51be35253cdd59c4cb034c master date: 2014-10-31 11:32:27 +0100 --- xen/arch/x86/hvm/svm/svm.c | 6 +++++- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 3f274f0..cb8f44f 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2460,7 +2460,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - domain_crash(v->domain); + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d56e5ff..1309c44 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3029,8 +3029,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#lx)\n", exit_reason); - domain_crash(v->domain); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCg9-0000DG-Q8; Fri, 14 Nov 2014 08:56:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCg8-0000D0-Fn for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:28 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id A7/53-05632-BB3C5645; Fri, 14 Nov 2014 08:56:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1415955386!11315800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18243 invoked from network); 14 Nov 2014 08:56:27 -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 2014 08:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCg6-0004U5-1n for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCg6-0002Hi-01 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:26 +0000 Date: Fri, 14 Nov 2014 08:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] process softirqs while dumping domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98cce7a6b0e3c6b69c5677b800a6b3bba9895d94 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:49:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:49:40 2014 +0100 process softirqs while dumping domains Process softirqs once per domain, and once every 64 vcpus in a guest to avoid being hit by the NMI watchdog. Discovered against a VM which had accidentally been assigned 8192 vcpus. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli master commit: 9cf71226edabd8b9bc81a5eb57823dacbe8b4bd8 master date: 2014-10-31 11:28:36 +0100 --- xen/common/keyhandler.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 8e4b3f8..7b7a799 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -254,6 +254,9 @@ static void dump_domains(unsigned char key) for_each_domain ( d ) { unsigned int i; + + process_pending_softirqs(); + printk("General information for domain %u:\n", d->domain_id); cpuset_print(tmpstr, sizeof(tmpstr), d->domain_dirty_cpumask); printk(" refcnt=%d dying=%d pause_count=%d\n", @@ -288,6 +291,9 @@ static void dump_domains(unsigned char key) d->domain_id); for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk(" VCPU%d: CPU%d [has=%c] poll=%d " "upcall_pend = %02x, upcall_mask = %02x ", v->vcpu_id, v->processor, @@ -310,6 +316,9 @@ static void dump_domains(unsigned char key) { for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk("Notifying guest %d:%d (virq %d, port %d)\n", d->domain_id, v->vcpu_id, VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG]); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCg9-0000DG-Q8; Fri, 14 Nov 2014 08:56:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCg8-0000D0-Fn for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:28 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id A7/53-05632-BB3C5645; Fri, 14 Nov 2014 08:56:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1415955386!11315800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18243 invoked from network); 14 Nov 2014 08:56:27 -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 2014 08:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCg6-0004U5-1n for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCg6-0002Hi-01 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:26 +0000 Date: Fri, 14 Nov 2014 08:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] process softirqs while dumping domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98cce7a6b0e3c6b69c5677b800a6b3bba9895d94 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:49:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:49:40 2014 +0100 process softirqs while dumping domains Process softirqs once per domain, and once every 64 vcpus in a guest to avoid being hit by the NMI watchdog. Discovered against a VM which had accidentally been assigned 8192 vcpus. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli master commit: 9cf71226edabd8b9bc81a5eb57823dacbe8b4bd8 master date: 2014-10-31 11:28:36 +0100 --- xen/common/keyhandler.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 8e4b3f8..7b7a799 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -254,6 +254,9 @@ static void dump_domains(unsigned char key) for_each_domain ( d ) { unsigned int i; + + process_pending_softirqs(); + printk("General information for domain %u:\n", d->domain_id); cpuset_print(tmpstr, sizeof(tmpstr), d->domain_dirty_cpumask); printk(" refcnt=%d dying=%d pause_count=%d\n", @@ -288,6 +291,9 @@ static void dump_domains(unsigned char key) d->domain_id); for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk(" VCPU%d: CPU%d [has=%c] poll=%d " "upcall_pend = %02x, upcall_mask = %02x ", v->vcpu_id, v->processor, @@ -310,6 +316,9 @@ static void dump_domains(unsigned char key) { for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk("Notifying guest %d:%d (virq %d, port %d)\n", d->domain_id, v->vcpu_id, VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG]); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56: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 1XpCgK-0000FZ-Sc; Fri, 14 Nov 2014 08:56:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCgI-0000FG-W2 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:39 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id E0/BF-02699-6C3C5645; Fri, 14 Nov 2014 08:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1415955396!7877375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7324 invoked from network); 14 Nov 2014 08:56:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCgG-0004UD-7z for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCgG-0002If-5b for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:36 +0000 Date: Fri, 14 Nov 2014 08:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/PVH: replace bogus assertion with conditional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 184e82513e3a4eb16b92e891d1d0ab719320c0ea Author: Jan Beulich AuthorDate: Thu Nov 13 09:50:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:50:13 2014 +0100 x86/PVH: replace bogus assertion with conditional While PVH guests currently have to start in 64-bit mode, nothing keeps them from entering compatibility mode via a suitable ring-0 code selector and making a hypercall from there. Fail such attempts rather than asserting they won't happen. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 01c019c843df313f62ca5c106544026867da9e9e master date: 2014-11-04 13:07:23 +0100 --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b004b74..84efe48 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3546,10 +3546,10 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 0; } + else if ( unlikely(is_pvh_vcpu(curr)) ) + regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ 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, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 08:56:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 08:56: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 1XpCgK-0000FZ-Sc; Fri, 14 Nov 2014 08:56:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCgI-0000FG-W2 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:39 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id E0/BF-02699-6C3C5645; Fri, 14 Nov 2014 08:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1415955396!7877375!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7324 invoked from network); 14 Nov 2014 08:56:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 08:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpCgG-0004UD-7z for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpCgG-0002If-5b for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 08:56:36 +0000 Date: Fri, 14 Nov 2014 08:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/PVH: replace bogus assertion with conditional X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 184e82513e3a4eb16b92e891d1d0ab719320c0ea Author: Jan Beulich AuthorDate: Thu Nov 13 09:50:13 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:50:13 2014 +0100 x86/PVH: replace bogus assertion with conditional While PVH guests currently have to start in 64-bit mode, nothing keeps them from entering compatibility mode via a suitable ring-0 code selector and making a hypercall from there. Fail such attempts rather than asserting they won't happen. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 01c019c843df313f62ca5c106544026867da9e9e master date: 2014-11-04 13:07:23 +0100 --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b004b74..84efe48 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3546,10 +3546,10 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) regs->r8, regs->r9); curr->arch.hvm_vcpu.hcall_64bit = 0; } + else if ( unlikely(is_pvh_vcpu(curr)) ) + regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ 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, -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 09:22:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:22: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 1XpD4w-0001HW-Nw; Fri, 14 Nov 2014 09:22:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD4v-0001HM-Gr for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:05 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id EB/4A-24532-CB9C5645; Fri, 14 Nov 2014 09:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1415956923!12675792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16195 invoked from network); 14 Nov 2014 09:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 09:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD4t-0004mL-2R for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD4s-0003JZ-Vw for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:03 +0000 Date: Fri, 14 Nov 2014 09:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] fix listing of vcpus when domains lacking any vcpus exist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fccb5892c8fc3c191592fb933a0e044260f4f069 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:52:09 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:52:09 2014 +0100 fix listing of vcpus when domains lacking any vcpus exist On a system which looks like this: [root@st04 ~]# xl list Name ID Mem VCPUs State Time(s) Domain-0 0 752 4 r----- 46699.3 (null) 1 0 0 --p--- 0.0 (null) 2 0 0 --p--- 0.0 (null) 3 0 0 --p--- 0.0 badger 25 0 1 --p--- 0.0 `xl vcpu-list` failes as so: [root@st04 ~]# xl vcpu-list Name ID VCPU CPU State Time(s) CPU Affinity Domain-0 0 0 0 -b- 12171.0 all Domain-0 0 1 1 -b- 11779.6 all Domain-0 0 2 2 -b- 11599.0 all Domain-0 0 3 3 r-- 11007.0 all libxl: critical: libxl__calloc: libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) : Cannot allocate memory libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) The root cause of this is in Xen. getdomaininfo() has no way of expressing "this domain has no vcpus". Previously, info->max_vcpu_id would be returned uninitialised in such a case. Unfortunately, setting it to 0 as a default is not appropriate. A max_vcpu_id of 0 and nr_online_cpus of 0 is the valid state for a single vcpu domain which is in the process of being destroyed. As all components are required to add 1 to max_vcpu_id to get the number of vcpus, an id of ~0U is not valid to be used. Explicitly define this as an invalid max vcpu value, and use it to express "no vcpus" in getdomaininfo() In libxl, the issue is seen as libxl_list_vcpu() attempts to use the uninitialised domaininfo.max_vcpu_id for memory allocation. Check domaininfo.max_vcpu_id against the new sentinel value XEN_INVALID_MAX_VCPU_ID, and return early. This means that it is now valid for libxl_list_vcpu() to return NULL for a domain which lacks any vcpus. As part of this change, remove the pointless call to libxl_get_max_cpus(), whose returned value is unconditionally clobbered in the for() loop. Reported-by: Euan Harris Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Don Slutz Acked-by: Ian Campbell tools/libxl: Fix libxl_list_vcpu() following c/s 93e52d52 My reasoning regarding nr_cpus_out was wrong, as I had confused nr_cpus_out with nr_vcpus_out. Dario pointed this out, but the patch (having gained appropriate acks) got committed before I could post a correction. Noticed-by: Dario Faggioli Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell master commit: 93e52d5242804ff928131553599afa769f85481b master date: 2014-10-23 10:19:53 +0200 master commit: c90a755f261b8ccb3dac7e1f695122cac95c6053 master date: 2014-10-23 12:29:00 +0100 --- tools/libxl/libxl.c | 5 +++++ tools/libxl/xl_cmdimpl.c | 4 +--- xen/common/domctl.c | 1 + xen/include/public/domctl.h | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3d9543b..75f5053 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4171,6 +4171,11 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting infolist"); return NULL; } + + if (domaininfo.max_vcpu_id == XEN_INVALID_MAX_VCPU_ID) { + return NULL; + } + *nr_vcpus_out = libxl_get_max_cpus(ctx); ret = ptr = calloc(domaininfo.max_vcpu_id + 1, sizeof (libxl_vcpuinfo)); if (!ptr) { diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a7f888c..b251f4c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4384,10 +4384,8 @@ static void print_domain_vcpuinfo(uint32_t domid, uint32_t nr_cpus) vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nrcpus); - if (!vcpuinfo) { - fprintf(stderr, "libxl_list_vcpu failed.\n"); + if (!vcpuinfo) return; - } for (i = 0; i < nb_vcpu; i++) { print_vcpuinfo(domid, &vcpuinfo[i], nr_cpus); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 2747dcd..9988293 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -154,6 +154,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) struct vcpu_runstate_info runstate; info->domain = d->domain_id; + info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; info->nr_online_vcpus = 0; info->ssidref = 0; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 4c5b2bb..d381903 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -101,6 +101,7 @@ struct xen_domctl_getdomaininfo { uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ uint64_aligned_t cpu_time; uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ +#define XEN_INVALID_MAX_VCPU_ID (~0U) /* Domain has no vcpus? */ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ uint32_t ssidref; xen_domain_handle_t handle; -- 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 14 09:22:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:22: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 1XpD4w-0001HW-Nw; Fri, 14 Nov 2014 09:22:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD4v-0001HM-Gr for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:05 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id EB/4A-24532-CB9C5645; Fri, 14 Nov 2014 09:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1415956923!12675792!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16195 invoked from network); 14 Nov 2014 09:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 09:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD4t-0004mL-2R for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD4s-0003JZ-Vw for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:03 +0000 Date: Fri, 14 Nov 2014 09:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] fix listing of vcpus when domains lacking any vcpus exist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fccb5892c8fc3c191592fb933a0e044260f4f069 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:52:09 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:52:09 2014 +0100 fix listing of vcpus when domains lacking any vcpus exist On a system which looks like this: [root@st04 ~]# xl list Name ID Mem VCPUs State Time(s) Domain-0 0 752 4 r----- 46699.3 (null) 1 0 0 --p--- 0.0 (null) 2 0 0 --p--- 0.0 (null) 3 0 0 --p--- 0.0 badger 25 0 1 --p--- 0.0 `xl vcpu-list` failes as so: [root@st04 ~]# xl vcpu-list Name ID VCPU CPU State Time(s) CPU Affinity Domain-0 0 0 0 -b- 12171.0 all Domain-0 0 1 1 -b- 11779.6 all Domain-0 0 2 2 -b- 11599.0 all Domain-0 0 3 3 r-- 11007.0 all libxl: critical: libxl__calloc: libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) : Cannot allocate memory libxl: FATAL ERROR: memory allocation failure (libxl__calloc, 4294935299 x 40) The root cause of this is in Xen. getdomaininfo() has no way of expressing "this domain has no vcpus". Previously, info->max_vcpu_id would be returned uninitialised in such a case. Unfortunately, setting it to 0 as a default is not appropriate. A max_vcpu_id of 0 and nr_online_cpus of 0 is the valid state for a single vcpu domain which is in the process of being destroyed. As all components are required to add 1 to max_vcpu_id to get the number of vcpus, an id of ~0U is not valid to be used. Explicitly define this as an invalid max vcpu value, and use it to express "no vcpus" in getdomaininfo() In libxl, the issue is seen as libxl_list_vcpu() attempts to use the uninitialised domaininfo.max_vcpu_id for memory allocation. Check domaininfo.max_vcpu_id against the new sentinel value XEN_INVALID_MAX_VCPU_ID, and return early. This means that it is now valid for libxl_list_vcpu() to return NULL for a domain which lacks any vcpus. As part of this change, remove the pointless call to libxl_get_max_cpus(), whose returned value is unconditionally clobbered in the for() loop. Reported-by: Euan Harris Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Don Slutz Acked-by: Ian Campbell tools/libxl: Fix libxl_list_vcpu() following c/s 93e52d52 My reasoning regarding nr_cpus_out was wrong, as I had confused nr_cpus_out with nr_vcpus_out. Dario pointed this out, but the patch (having gained appropriate acks) got committed before I could post a correction. Noticed-by: Dario Faggioli Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Reviewed-by: Dario Faggioli Acked-by: Ian Campbell master commit: 93e52d5242804ff928131553599afa769f85481b master date: 2014-10-23 10:19:53 +0200 master commit: c90a755f261b8ccb3dac7e1f695122cac95c6053 master date: 2014-10-23 12:29:00 +0100 --- tools/libxl/libxl.c | 5 +++++ tools/libxl/xl_cmdimpl.c | 4 +--- xen/common/domctl.c | 1 + xen/include/public/domctl.h | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3d9543b..75f5053 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4171,6 +4171,11 @@ libxl_vcpuinfo *libxl_list_vcpu(libxl_ctx *ctx, uint32_t domid, LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting infolist"); return NULL; } + + if (domaininfo.max_vcpu_id == XEN_INVALID_MAX_VCPU_ID) { + return NULL; + } + *nr_vcpus_out = libxl_get_max_cpus(ctx); ret = ptr = calloc(domaininfo.max_vcpu_id + 1, sizeof (libxl_vcpuinfo)); if (!ptr) { diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a7f888c..b251f4c 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4384,10 +4384,8 @@ static void print_domain_vcpuinfo(uint32_t domid, uint32_t nr_cpus) vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nrcpus); - if (!vcpuinfo) { - fprintf(stderr, "libxl_list_vcpu failed.\n"); + if (!vcpuinfo) return; - } for (i = 0; i < nb_vcpu; i++) { print_vcpuinfo(domid, &vcpuinfo[i], nr_cpus); diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 2747dcd..9988293 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -154,6 +154,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) struct vcpu_runstate_info runstate; info->domain = d->domain_id; + info->max_vcpu_id = XEN_INVALID_MAX_VCPU_ID; info->nr_online_vcpus = 0; info->ssidref = 0; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 4c5b2bb..d381903 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -101,6 +101,7 @@ struct xen_domctl_getdomaininfo { uint64_aligned_t shared_info_frame; /* GMFN of shared_info struct */ uint64_aligned_t cpu_time; uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ +#define XEN_INVALID_MAX_VCPU_ID (~0U) /* Domain has no vcpus? */ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ uint32_t ssidref; xen_domain_handle_t handle; -- 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 14 09:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD56-0001T9-Qb; Fri, 14 Nov 2014 09:22:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD55-0001St-PG for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:15 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id D0/37-02699-7C9C5645; Fri, 14 Nov 2014 09:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1415956933!12543807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12553 invoked from network); 14 Nov 2014 09:22:14 -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 2014 09:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD53-0004mR-97 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD53-0003Jx-6f for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:13 +0000 Date: Fri, 14 Nov 2014 09:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] vmx: fix save/restore issue with apicv X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b95a6a2005d653a8677d1733a8909997bbc6fc6 Author: Yang Zhang AuthorDate: Thu Nov 13 09:53:36 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:53:36 2014 +0100 vmx: fix save/restore issue with apicv This patch fixes two issues: 1. Interrupts on PIR are lost during save/restore. Syncing the PIR into IRR during save will fix it. 2. EOI exit bitmap doesn't set up correctly after restore. Here we will construct the eoi exit bitmap via (IRR | ISR). Though it may cause unnecessary eoi exit of the interrupts that pending in IRR or ISR during save/restore, each pending interrupt only causes one vmexit. The subsequent interrupts will adjust the eoi exit bitmap correctly. So the performance hurt can be ignored. Signed-off-by: Yang Zhang Signed-off-by: Olaf Hering Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 607e8494c42397fb249191904066cace6ac9a880 master date: 2014-10-27 16:40:18 +0100 --- xen/arch/x86/hvm/vlapic.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 24 ++++++++++++++++++++++++ xen/include/asm-x86/hvm/vlapic.h | 2 ++ xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 4 files changed, 30 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 26f2c89..c8d1c6e 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1161,6 +1161,9 @@ static int lapic_save_regs(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + if ( hvm_funcs.sync_pir_to_irr ) + hvm_funcs.sync_pir_to_irr(v); + s = vcpu_vlapic(v); if ( (rc = hvm_save_entry(LAPIC_REGS, v->vcpu_id, h, s->regs)) != 0 ) break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fb76a34..7a2f052 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1518,6 +1518,8 @@ static void vmx_process_isr(int isr, struct vcpu *v) { unsigned long status; u8 old; + unsigned int i; + const struct vlapic *vlapic = vcpu_vlapic(v); if ( !cpu_has_vmx_virtual_intr_delivery ) return; @@ -1534,6 +1536,28 @@ static void vmx_process_isr(int isr, struct vcpu *v) status |= isr << VMX_GUEST_INTR_STATUS_SVI_OFFSET; __vmwrite(GUEST_INTR_STATUS, status); } + + /* + * Theoretically, only level triggered interrupts can have their + * corresponding bits set in the eoi exit bitmap. That is, the bits + * set in the eoi exit bitmap should also be set in TMR. But a periodic + * timer interrupt does not follow the rule: it is edge triggered, but + * requires its corresponding bit be set in the eoi exit bitmap. So we + * should not construct the eoi exit bitmap based on TMR. + * Here we will construct the eoi exit bitmap via (IRR | ISR). This + * means that EOIs to the interrupts that are set in the IRR or ISR will + * cause VM exits after restoring, regardless of the trigger modes. It + * is acceptable because the subsequent interrupts will set up the eoi + * bitmap correctly. + */ + for ( i = 0x10; i < NR_VECTORS; ++i ) + if ( vlapic_test_vector(i, &vlapic->regs->data[APIC_IRR]) || + vlapic_test_vector(i, &vlapic->regs->data[APIC_ISR]) ) + set_bit(i, v->arch.hvm_vmx.eoi_exit_bitmap); + + for ( i = 0; i < ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); ++i ) + __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm_vmx.eoi_exit_bitmap[i]); + vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index 4ef0570..b7326e6 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -60,6 +60,8 @@ #define VEC_POS(v) ((v) % 32) #define REG_POS(v) (((v) / 32) * 0x10) +#define vlapic_test_vector(vec, bitmap) \ + test_bit(VEC_POS(vec), (const uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_set_vector(vec, bitmap) \ test_and_set_bit(VEC_POS(vec), (uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_clear_vector(vec, bitmap) \ diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 4ab7cb6..0434a78 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -334,6 +334,7 @@ enum vmcs_field { EPT_POINTER = 0x0000201a, EPT_POINTER_HIGH = 0x0000201b, EOI_EXIT_BITMAP0 = 0x0000201c, +#define EOI_EXIT_BITMAP(n) (EOI_EXIT_BITMAP0 + (n) * 2) /* n = 0...3 */ EOI_EXIT_BITMAP0_HIGH = 0x0000201d, EOI_EXIT_BITMAP1 = 0x0000201e, EOI_EXIT_BITMAP1_HIGH = 0x0000201f, -- 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 14 09:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD56-0001T9-Qb; Fri, 14 Nov 2014 09:22:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD55-0001St-PG for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:15 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id D0/37-02699-7C9C5645; Fri, 14 Nov 2014 09:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1415956933!12543807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12553 invoked from network); 14 Nov 2014 09:22:14 -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 2014 09:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD53-0004mR-97 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD53-0003Jx-6f for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:13 +0000 Date: Fri, 14 Nov 2014 09:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] vmx: fix save/restore issue with apicv X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b95a6a2005d653a8677d1733a8909997bbc6fc6 Author: Yang Zhang AuthorDate: Thu Nov 13 09:53:36 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:53:36 2014 +0100 vmx: fix save/restore issue with apicv This patch fixes two issues: 1. Interrupts on PIR are lost during save/restore. Syncing the PIR into IRR during save will fix it. 2. EOI exit bitmap doesn't set up correctly after restore. Here we will construct the eoi exit bitmap via (IRR | ISR). Though it may cause unnecessary eoi exit of the interrupts that pending in IRR or ISR during save/restore, each pending interrupt only causes one vmexit. The subsequent interrupts will adjust the eoi exit bitmap correctly. So the performance hurt can be ignored. Signed-off-by: Yang Zhang Signed-off-by: Olaf Hering Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 607e8494c42397fb249191904066cace6ac9a880 master date: 2014-10-27 16:40:18 +0100 --- xen/arch/x86/hvm/vlapic.c | 3 +++ xen/arch/x86/hvm/vmx/vmx.c | 24 ++++++++++++++++++++++++ xen/include/asm-x86/hvm/vlapic.h | 2 ++ xen/include/asm-x86/hvm/vmx/vmcs.h | 1 + 4 files changed, 30 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 26f2c89..c8d1c6e 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1161,6 +1161,9 @@ static int lapic_save_regs(struct domain *d, hvm_domain_context_t *h) for_each_vcpu ( d, v ) { + if ( hvm_funcs.sync_pir_to_irr ) + hvm_funcs.sync_pir_to_irr(v); + s = vcpu_vlapic(v); if ( (rc = hvm_save_entry(LAPIC_REGS, v->vcpu_id, h, s->regs)) != 0 ) break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index fb76a34..7a2f052 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1518,6 +1518,8 @@ static void vmx_process_isr(int isr, struct vcpu *v) { unsigned long status; u8 old; + unsigned int i; + const struct vlapic *vlapic = vcpu_vlapic(v); if ( !cpu_has_vmx_virtual_intr_delivery ) return; @@ -1534,6 +1536,28 @@ static void vmx_process_isr(int isr, struct vcpu *v) status |= isr << VMX_GUEST_INTR_STATUS_SVI_OFFSET; __vmwrite(GUEST_INTR_STATUS, status); } + + /* + * Theoretically, only level triggered interrupts can have their + * corresponding bits set in the eoi exit bitmap. That is, the bits + * set in the eoi exit bitmap should also be set in TMR. But a periodic + * timer interrupt does not follow the rule: it is edge triggered, but + * requires its corresponding bit be set in the eoi exit bitmap. So we + * should not construct the eoi exit bitmap based on TMR. + * Here we will construct the eoi exit bitmap via (IRR | ISR). This + * means that EOIs to the interrupts that are set in the IRR or ISR will + * cause VM exits after restoring, regardless of the trigger modes. It + * is acceptable because the subsequent interrupts will set up the eoi + * bitmap correctly. + */ + for ( i = 0x10; i < NR_VECTORS; ++i ) + if ( vlapic_test_vector(i, &vlapic->regs->data[APIC_IRR]) || + vlapic_test_vector(i, &vlapic->regs->data[APIC_ISR]) ) + set_bit(i, v->arch.hvm_vmx.eoi_exit_bitmap); + + for ( i = 0; i < ARRAY_SIZE(v->arch.hvm_vmx.eoi_exit_bitmap); ++i ) + __vmwrite(EOI_EXIT_BITMAP(i), v->arch.hvm_vmx.eoi_exit_bitmap[i]); + vmx_vmcs_exit(v); } diff --git a/xen/include/asm-x86/hvm/vlapic.h b/xen/include/asm-x86/hvm/vlapic.h index 4ef0570..b7326e6 100644 --- a/xen/include/asm-x86/hvm/vlapic.h +++ b/xen/include/asm-x86/hvm/vlapic.h @@ -60,6 +60,8 @@ #define VEC_POS(v) ((v) % 32) #define REG_POS(v) (((v) / 32) * 0x10) +#define vlapic_test_vector(vec, bitmap) \ + test_bit(VEC_POS(vec), (const uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_set_vector(vec, bitmap) \ test_and_set_bit(VEC_POS(vec), (uint32_t *)((bitmap) + REG_POS(vec))) #define vlapic_test_and_clear_vector(vec, bitmap) \ diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 4ab7cb6..0434a78 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -334,6 +334,7 @@ enum vmcs_field { EPT_POINTER = 0x0000201a, EPT_POINTER_HIGH = 0x0000201b, EOI_EXIT_BITMAP0 = 0x0000201c, +#define EOI_EXIT_BITMAP(n) (EOI_EXIT_BITMAP0 + (n) * 2) /* n = 0...3 */ EOI_EXIT_BITMAP0_HIGH = 0x0000201d, EOI_EXIT_BITMAP1 = 0x0000201e, EOI_EXIT_BITMAP1_HIGH = 0x0000201f, -- 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 14 09:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD5H-0001Um-TE; Fri, 14 Nov 2014 09:22:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5H-0001Ud-1v for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:27 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 96/5E-16982-1D9C5645; Fri, 14 Nov 2014 09:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1415956943!11397440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3717 invoked from network); 14 Nov 2014 09:22: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 2014 09:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5D-0004mX-HN for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5D-0003KJ-Cs for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:23 +0000 Date: Fri, 14 Nov 2014 09:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvm/load: correct length checks for zeroextended records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca351d09876bd377f940387cd50fba65a92a1c8d Author: Andrew Cooper AuthorDate: Thu Nov 13 09:54:31 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:54:31 2014 +0100 hvm/load: correct length checks for zeroextended records In the case that Xen is attempting to load a zeroextended HVM record where the difference needing extending would overflow the data blob, _hvm_check_entry() will incorrectly fail before working out that it would have been safe. The "len + sizeof(*d)" check is wrong. Consider zeroextending a 16 byte record into a 32 byte structure. "32 + hdr" will fail the overall context length check even though the pre-extended record in the stream is 16 bytes. The first condition is reduced to just a length check for hvm save header, while the second condition is extended to include a check that the record in the stream not exceeding the stream length. The error messages are extended to include further useful information. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Reviewed-by: Jan Beulich master commit: 66d0c0aa1f3e57e873fd64d1d370e11758d25442 master date: 2014-10-27 16:41:50 +0100 --- xen/common/hvm/save.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/common/hvm/save.c b/xen/common/hvm/save.c index 6c16399..da6e668 100644 --- a/xen/common/hvm/save.c +++ b/xen/common/hvm/save.c @@ -292,19 +292,22 @@ int _hvm_check_entry(struct hvm_domain_context *h, { struct hvm_save_descriptor *d = (struct hvm_save_descriptor *)&h->data[h->cur]; - if ( len + sizeof (*d) > h->size - h->cur) + if ( sizeof(*d) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM restore: not enough data left to read %u bytes " - "for type %u\n", len, type); + "HVM restore: not enough data left to read %zu bytes " + "for type %u header\n", sizeof(*d), type); return -1; - } - if ( (type != d->typecode) || (len < d->length) || - (strict_length && (len != d->length)) ) + } + if ( (type != d->typecode) || + (strict_length ? (len != d->length) : (len < d->length)) || + (d->length > (h->size - h->cur - sizeof(*d))) ) { printk(XENLOG_G_WARNING - "HVM restore mismatch: expected type %u length %u, " - "saw type %u length %u\n", type, len, d->typecode, d->length); + "HVM restore mismatch: expected %s type %u length %u, " + "saw type %u length %u. %zu bytes remaining\n", + strict_length ? "strict" : "zeroextended", type, len, + d->typecode, d->length, h->size - h->cur - sizeof(*d)); return -1; } h->cur += sizeof(*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 Fri Nov 14 09:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD5H-0001Um-TE; Fri, 14 Nov 2014 09:22:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5H-0001Ud-1v for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:27 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 96/5E-16982-1D9C5645; Fri, 14 Nov 2014 09:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1415956943!11397440!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3717 invoked from network); 14 Nov 2014 09:22: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 2014 09:22:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5D-0004mX-HN for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5D-0003KJ-Cs for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:23 +0000 Date: Fri, 14 Nov 2014 09:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] hvm/load: correct length checks for zeroextended records X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca351d09876bd377f940387cd50fba65a92a1c8d Author: Andrew Cooper AuthorDate: Thu Nov 13 09:54:31 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:54:31 2014 +0100 hvm/load: correct length checks for zeroextended records In the case that Xen is attempting to load a zeroextended HVM record where the difference needing extending would overflow the data blob, _hvm_check_entry() will incorrectly fail before working out that it would have been safe. The "len + sizeof(*d)" check is wrong. Consider zeroextending a 16 byte record into a 32 byte structure. "32 + hdr" will fail the overall context length check even though the pre-extended record in the stream is 16 bytes. The first condition is reduced to just a length check for hvm save header, while the second condition is extended to include a check that the record in the stream not exceeding the stream length. The error messages are extended to include further useful information. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Reviewed-by: Jan Beulich master commit: 66d0c0aa1f3e57e873fd64d1d370e11758d25442 master date: 2014-10-27 16:41:50 +0100 --- xen/common/hvm/save.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/xen/common/hvm/save.c b/xen/common/hvm/save.c index 6c16399..da6e668 100644 --- a/xen/common/hvm/save.c +++ b/xen/common/hvm/save.c @@ -292,19 +292,22 @@ int _hvm_check_entry(struct hvm_domain_context *h, { struct hvm_save_descriptor *d = (struct hvm_save_descriptor *)&h->data[h->cur]; - if ( len + sizeof (*d) > h->size - h->cur) + if ( sizeof(*d) > h->size - h->cur) { printk(XENLOG_G_WARNING - "HVM restore: not enough data left to read %u bytes " - "for type %u\n", len, type); + "HVM restore: not enough data left to read %zu bytes " + "for type %u header\n", sizeof(*d), type); return -1; - } - if ( (type != d->typecode) || (len < d->length) || - (strict_length && (len != d->length)) ) + } + if ( (type != d->typecode) || + (strict_length ? (len != d->length) : (len < d->length)) || + (d->length > (h->size - h->cur - sizeof(*d))) ) { printk(XENLOG_G_WARNING - "HVM restore mismatch: expected type %u length %u, " - "saw type %u length %u\n", type, len, d->typecode, d->length); + "HVM restore mismatch: expected %s type %u length %u, " + "saw type %u length %u. %zu bytes remaining\n", + strict_length ? "strict" : "zeroextended", type, len, + d->typecode, d->length, h->size - h->cur - sizeof(*d)); return -1; } h->cur += sizeof(*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 Fri Nov 14 09:22:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD5Q-0001Y3-Vn; Fri, 14 Nov 2014 09:22:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5Q-0001XP-DA for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:36 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id D9/04-02699-BD9C5645; Fri, 14 Nov 2014 09:22:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1415956953!12527859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27219 invoked from network); 14 Nov 2014 09:22:34 -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; 14 Nov 2014 09:22:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5N-0004mc-Oj for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5N-0003Kj-KW for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:33 +0000 Date: Fri, 14 Nov 2014 09:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: tolerate running on EFI runtime services page tables in map_domain_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 4e464bb0c31019cb01efa0c04ca754f8e53c278c Author: Jan Beulich AuthorDate: Thu Nov 13 09:55:19 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:55:19 2014 +0100 x86: tolerate running on EFI runtime services page tables in map_domain_page() In the event of a #PF while in an EFI runtime service function we otherwise can't dump the page tables, making the analysis of the problem more cumbersome. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: e65436ba36be8f1b735573d8fc9af7d8a053ba5f master date: 2014-10-27 16:43:12 +0100 --- xen/arch/x86/domain_page.c | 6 +++++- xen/arch/x86/efi/runtime.c | 5 +++++ xen/arch/x86/efi/stub.c | 6 ++++++ xen/include/xen/efi.h | 1 + 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 9297ea0..50f54e5 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -36,11 +37,14 @@ static inline struct vcpu *mapcache_current_vcpu(void) */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && !is_hvm_vcpu(v) ) { + unsigned long cr3; + /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT(read_cr3() == __pa(idle_pg_table)); + ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || + (efi_enabled && cr3 == efi_rs_page_table())); } return v; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index e67052b..ec1b227 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -93,6 +93,11 @@ void efi_rs_leave(unsigned long cr3) stts(); } +paddr_t efi_rs_page_table(void) +{ + return virt_to_maddr(efi_l4_pgtable); +} + unsigned long efi_get_time(void) { EFI_TIME time; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 1520bae..8a91482 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -9,6 +9,12 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +paddr_t efi_rs_page_table(void) +{ + BUG(); + return 0; +} + unsigned long efi_get_time(void) { BUG(); diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 8a2b788..5e02724 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,6 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); +paddr_t efi_rs_page_table(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.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 14 09:22:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD5Q-0001Y3-Vn; Fri, 14 Nov 2014 09:22:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5Q-0001XP-DA for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:36 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id D9/04-02699-BD9C5645; Fri, 14 Nov 2014 09:22:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1415956953!12527859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27219 invoked from network); 14 Nov 2014 09:22:34 -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; 14 Nov 2014 09:22:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5N-0004mc-Oj for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5N-0003Kj-KW for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:33 +0000 Date: Fri, 14 Nov 2014 09:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: tolerate running on EFI runtime services page tables in map_domain_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 4e464bb0c31019cb01efa0c04ca754f8e53c278c Author: Jan Beulich AuthorDate: Thu Nov 13 09:55:19 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:55:19 2014 +0100 x86: tolerate running on EFI runtime services page tables in map_domain_page() In the event of a #PF while in an EFI runtime service function we otherwise can't dump the page tables, making the analysis of the problem more cumbersome. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: e65436ba36be8f1b735573d8fc9af7d8a053ba5f master date: 2014-10-27 16:43:12 +0100 --- xen/arch/x86/domain_page.c | 6 +++++- xen/arch/x86/efi/runtime.c | 5 +++++ xen/arch/x86/efi/stub.c | 6 ++++++ xen/include/xen/efi.h | 1 + 4 files changed, 17 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index 9297ea0..50f54e5 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include @@ -36,11 +37,14 @@ static inline struct vcpu *mapcache_current_vcpu(void) */ if ( unlikely(pagetable_is_null(v->arch.guest_table)) && !is_hvm_vcpu(v) ) { + unsigned long cr3; + /* If we really are idling, perform lazy context switch now. */ if ( (v = idle_vcpu[smp_processor_id()]) == current ) sync_local_execstate(); /* We must now be running on the idle page table. */ - ASSERT(read_cr3() == __pa(idle_pg_table)); + ASSERT((cr3 = read_cr3()) == __pa(idle_pg_table) || + (efi_enabled && cr3 == efi_rs_page_table())); } return v; diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index e67052b..ec1b227 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -93,6 +93,11 @@ void efi_rs_leave(unsigned long cr3) stts(); } +paddr_t efi_rs_page_table(void) +{ + return virt_to_maddr(efi_l4_pgtable); +} + unsigned long efi_get_time(void) { EFI_TIME time; diff --git a/xen/arch/x86/efi/stub.c b/xen/arch/x86/efi/stub.c index 1520bae..8a91482 100644 --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -9,6 +9,12 @@ const bool_t efi_enabled = 0; void __init efi_init_memory(void) { } +paddr_t efi_rs_page_table(void) +{ + BUG(); + return 0; +} + unsigned long efi_get_time(void) { BUG(); diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h index 8a2b788..5e02724 100644 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -28,6 +28,7 @@ struct xenpf_efi_runtime_call; struct compat_pf_efi_runtime_call; void efi_init_memory(void); +paddr_t efi_rs_page_table(void); unsigned long efi_get_time(void); void efi_halt_system(void); void efi_reset_system(bool_t warm); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.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 14 09:22:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5b-0001aX-5E; Fri, 14 Nov 2014 09:22:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5a-0001aE-Ct for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:46 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 4D/16-09842-5E9C5645; Fri, 14 Nov 2014 09:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1415956964!12723480!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15464 invoked from network); 14 Nov 2014 09:22:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 09:22:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5X-0004ml-TA for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5X-0003Lb-SA for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:43 +0000 Date: Fri, 14 Nov 2014 09:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] EFI: allow to suppress the use of runtime services X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 151786a987757a00c378dee280d5b857b31ad16e Author: Jan Beulich AuthorDate: Thu Nov 13 09:56:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:56:07 2014 +0100 EFI: allow to suppress the use of runtime services On certain systems some of the memory map entries designated for use by runtime services cannot be mapped (frequently due to firmware bugs). On others, some of the memory map entries aren't even marked for runtime services use, yet are being used by them. For both cases give people a way to suppress use of runtime services altogether. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 5680244040d26234a43c7f884ecf98fa4928d0da master date: 2014-10-27 16:43:52 +0100 --- docs/misc/xen-command-line.markdown | 7 +++ xen/arch/x86/efi/boot.c | 12 +++++- xen/arch/x86/efi/runtime.c | 86 +++++++++++++++++++++++++--------- 3 files changed, 81 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 6e50f0a..757e46f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -488,6 +488,13 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. +### efi-rs +> `= ` + +> Default: `true` + +Force or disable use of EFI runtime services. + ### extra\_guest\_irqs > `= ` diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 7eabcea..2cdf1be 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1497,6 +1497,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } + +static bool_t __initdata efi_rs_enable = 1; +boolean_param("efi-rs", efi_rs_enable); + #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, @@ -1570,7 +1574,7 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1634,6 +1638,12 @@ void __init efi_init_memory(void) } } + if ( !efi_rs_enable ) + { + efi_fw_vendor = NULL; + return; + } + #ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index ec1b227..7787f51 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -51,6 +51,9 @@ unsigned long efi_rs_enter(void) static const u32 mxcsr = MXCSR_DEFAULT; unsigned long cr3 = read_cr3(); + if ( !efi_l4_pgtable ) + return 0; + save_fpu_enable(); asm volatile ( "fldcw %0" :: "m" (fcw) ); asm volatile ( "ldmxcsr %0" :: "m" (mxcsr) ); @@ -78,6 +81,8 @@ unsigned long efi_rs_enter(void) void efi_rs_leave(unsigned long cr3) { + if ( !cr3 ) + return; write_cr3(cr3); if ( !is_hvm_vcpu(current) && !is_idle_vcpu(current) ) { @@ -95,7 +100,7 @@ void efi_rs_leave(unsigned long cr3) paddr_t efi_rs_page_table(void) { - return virt_to_maddr(efi_l4_pgtable); + return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; } unsigned long efi_get_time(void) @@ -104,6 +109,8 @@ unsigned long efi_get_time(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(), flags; + if ( !cr3 ) + return 0; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(&time, NULL); spin_unlock_irqrestore(&rtc_lock, flags); @@ -121,6 +128,8 @@ void efi_halt_system(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -132,6 +141,8 @@ void efi_reset_system(bool_t warm) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(warm ? EfiResetWarm : EfiResetCold, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -154,6 +165,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) { unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; info->version = efi_rs->Hdr.Revision; efi_rs_leave(cr3); break; @@ -163,6 +176,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) info->cfg.nent = efi_num_ct; break; case XEN_FW_EFI_VENDOR: + if ( !efi_fw_vendor ) + return -EOPNOTSUPP; info->vendor.revision = efi_fw_revision; n = info->vendor.bufsz / sizeof(*efi_fw_vendor); if ( !guest_handle_okay(guest_handle_cast(info->vendor.name, @@ -285,6 +300,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(cast_time(&op->u.get_time.time), &caps); spin_unlock_irqrestore(&rtc_lock, flags); @@ -305,6 +322,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetTime(cast_time(&op->u.set_time)); spin_unlock_irqrestore(&rtc_lock, flags); @@ -319,6 +338,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetWakeupTime(&enabled, &pending, cast_time(&op->u.get_wakeup_time)); @@ -341,6 +362,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetWakeupTime(!!(op->misc & XEN_EFI_SET_WAKEUP_TIME_ENABLE), @@ -359,7 +382,10 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - status = efi_rs->GetNextHighMonotonicCount(&op->misc); + if ( cr3 ) + status = efi_rs->GetNextHighMonotonicCount(&op->misc); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); break; @@ -395,15 +421,20 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) data = NULL; cr3 = efi_rs_enter(); - status = efi_rs->GetVariable( - name, cast_guid(&op->u.get_variable.vendor_guid), - &op->misc, &size, data); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetVariable( + name, cast_guid(&op->u.get_variable.vendor_guid), + &op->misc, &size, data); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_variable.data, data, size) ) - rc = -EFAULT; - op->u.get_variable.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_variable.data, data, size) ) + rc = -EFAULT; + op->u.get_variable.size = size; + } + else + rc = -EOPNOTSUPP; xfree(data); xfree(name); @@ -433,9 +464,12 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) else { cr3 = efi_rs_enter(); - status = efi_rs->SetVariable( - name, cast_guid(&op->u.set_variable.vendor_guid), - op->misc, op->u.set_variable.size, data); + if ( cr3 ) + status = efi_rs->SetVariable( + name, cast_guid(&op->u.set_variable.vendor_guid), + op->misc, op->u.set_variable.size, data); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); } @@ -467,15 +501,21 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - status = efi_rs->GetNextVariableName( - &size, name.str, - cast_guid(&op->u.get_next_variable_name.vendor_guid)); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetNextVariableName( + &size, name.str, + cast_guid(&op->u.get_next_variable_name.vendor_guid)); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, name.raw, size) ) - rc = -EFAULT; - op->u.get_next_variable_name.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_next_variable_name.name, + name.raw, size) ) + rc = -EFAULT; + op->u.get_next_variable_name.size = size; + } + else + rc = -EOPNOTSUPP; xfree(name.raw); } @@ -512,7 +552,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; @@ -531,7 +571,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; -- 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 14 09:22:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5b-0001aX-5E; Fri, 14 Nov 2014 09:22:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5a-0001aE-Ct for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:46 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 4D/16-09842-5E9C5645; Fri, 14 Nov 2014 09:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1415956964!12723480!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15464 invoked from network); 14 Nov 2014 09:22:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 09:22:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5X-0004ml-TA for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5X-0003Lb-SA for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:43 +0000 Date: Fri, 14 Nov 2014 09:22:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] EFI: allow to suppress the use of runtime services X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 151786a987757a00c378dee280d5b857b31ad16e Author: Jan Beulich AuthorDate: Thu Nov 13 09:56:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:56:07 2014 +0100 EFI: allow to suppress the use of runtime services On certain systems some of the memory map entries designated for use by runtime services cannot be mapped (frequently due to firmware bugs). On others, some of the memory map entries aren't even marked for runtime services use, yet are being used by them. For both cases give people a way to suppress use of runtime services altogether. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 5680244040d26234a43c7f884ecf98fa4928d0da master date: 2014-10-27 16:43:52 +0100 --- docs/misc/xen-command-line.markdown | 7 +++ xen/arch/x86/efi/boot.c | 12 +++++- xen/arch/x86/efi/runtime.c | 86 +++++++++++++++++++++++++--------- 3 files changed, 81 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 6e50f0a..757e46f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -488,6 +488,13 @@ Either force retrieval of monitor EDID information via VESA DDC, or disable it (edid=no). This option should not normally be required except for debugging purposes. +### efi-rs +> `= ` + +> Default: `true` + +Force or disable use of EFI runtime services. + ### extra\_guest\_irqs > `= ` diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 7eabcea..2cdf1be 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -1497,6 +1497,10 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) for( ; ; ); /* not reached */ } + +static bool_t __initdata efi_rs_enable = 1; +boolean_param("efi-rs", efi_rs_enable); + #ifndef USE_SET_VIRTUAL_ADDRESS_MAP static __init void copy_mapping(unsigned long mfn, unsigned long end, bool_t (*is_valid)(unsigned long smfn, @@ -1570,7 +1574,7 @@ void __init efi_init_memory(void) desc->PhysicalStart, desc->PhysicalStart + len - 1, desc->Type, desc->Attribute); - if ( !(desc->Attribute & EFI_MEMORY_RUNTIME) ) + if ( !efi_rs_enable || !(desc->Attribute & EFI_MEMORY_RUNTIME) ) continue; desc->VirtualStart = INVALID_VIRTUAL_ADDRESS; @@ -1634,6 +1638,12 @@ void __init efi_init_memory(void) } } + if ( !efi_rs_enable ) + { + efi_fw_vendor = NULL; + return; + } + #ifdef USE_SET_VIRTUAL_ADDRESS_MAP efi_rs->SetVirtualAddressMap(efi_memmap_size, efi_mdesc_size, mdesc_ver, efi_memmap); diff --git a/xen/arch/x86/efi/runtime.c b/xen/arch/x86/efi/runtime.c index ec1b227..7787f51 100644 --- a/xen/arch/x86/efi/runtime.c +++ b/xen/arch/x86/efi/runtime.c @@ -51,6 +51,9 @@ unsigned long efi_rs_enter(void) static const u32 mxcsr = MXCSR_DEFAULT; unsigned long cr3 = read_cr3(); + if ( !efi_l4_pgtable ) + return 0; + save_fpu_enable(); asm volatile ( "fldcw %0" :: "m" (fcw) ); asm volatile ( "ldmxcsr %0" :: "m" (mxcsr) ); @@ -78,6 +81,8 @@ unsigned long efi_rs_enter(void) void efi_rs_leave(unsigned long cr3) { + if ( !cr3 ) + return; write_cr3(cr3); if ( !is_hvm_vcpu(current) && !is_idle_vcpu(current) ) { @@ -95,7 +100,7 @@ void efi_rs_leave(unsigned long cr3) paddr_t efi_rs_page_table(void) { - return virt_to_maddr(efi_l4_pgtable); + return efi_l4_pgtable ? virt_to_maddr(efi_l4_pgtable) : 0; } unsigned long efi_get_time(void) @@ -104,6 +109,8 @@ unsigned long efi_get_time(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(), flags; + if ( !cr3 ) + return 0; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(&time, NULL); spin_unlock_irqrestore(&rtc_lock, flags); @@ -121,6 +128,8 @@ void efi_halt_system(void) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(EfiResetShutdown, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -132,6 +141,8 @@ void efi_reset_system(bool_t warm) EFI_STATUS status; unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return; status = efi_rs->ResetSystem(warm ? EfiResetWarm : EfiResetCold, EFI_SUCCESS, 0, NULL); efi_rs_leave(cr3); @@ -154,6 +165,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) { unsigned long cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; info->version = efi_rs->Hdr.Revision; efi_rs_leave(cr3); break; @@ -163,6 +176,8 @@ int efi_get_info(uint32_t idx, union xenpf_efi_info *info) info->cfg.nent = efi_num_ct; break; case XEN_FW_EFI_VENDOR: + if ( !efi_fw_vendor ) + return -EOPNOTSUPP; info->vendor.revision = efi_fw_revision; n = info->vendor.bufsz / sizeof(*efi_fw_vendor); if ( !guest_handle_okay(guest_handle_cast(info->vendor.name, @@ -285,6 +300,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetTime(cast_time(&op->u.get_time.time), &caps); spin_unlock_irqrestore(&rtc_lock, flags); @@ -305,6 +322,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetTime(cast_time(&op->u.set_time)); spin_unlock_irqrestore(&rtc_lock, flags); @@ -319,6 +338,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->GetWakeupTime(&enabled, &pending, cast_time(&op->u.get_wakeup_time)); @@ -341,6 +362,8 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); + if ( !cr3 ) + return -EOPNOTSUPP; spin_lock_irqsave(&rtc_lock, flags); status = efi_rs->SetWakeupTime(!!(op->misc & XEN_EFI_SET_WAKEUP_TIME_ENABLE), @@ -359,7 +382,10 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - status = efi_rs->GetNextHighMonotonicCount(&op->misc); + if ( cr3 ) + status = efi_rs->GetNextHighMonotonicCount(&op->misc); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); break; @@ -395,15 +421,20 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) data = NULL; cr3 = efi_rs_enter(); - status = efi_rs->GetVariable( - name, cast_guid(&op->u.get_variable.vendor_guid), - &op->misc, &size, data); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetVariable( + name, cast_guid(&op->u.get_variable.vendor_guid), + &op->misc, &size, data); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_variable.data, data, size) ) - rc = -EFAULT; - op->u.get_variable.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_variable.data, data, size) ) + rc = -EFAULT; + op->u.get_variable.size = size; + } + else + rc = -EOPNOTSUPP; xfree(data); xfree(name); @@ -433,9 +464,12 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) else { cr3 = efi_rs_enter(); - status = efi_rs->SetVariable( - name, cast_guid(&op->u.set_variable.vendor_guid), - op->misc, op->u.set_variable.size, data); + if ( cr3 ) + status = efi_rs->SetVariable( + name, cast_guid(&op->u.set_variable.vendor_guid), + op->misc, op->u.set_variable.size, data); + else + rc = -EOPNOTSUPP; efi_rs_leave(cr3); } @@ -467,15 +501,21 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - status = efi_rs->GetNextVariableName( - &size, name.str, - cast_guid(&op->u.get_next_variable_name.vendor_guid)); - efi_rs_leave(cr3); + if ( cr3 ) + { + status = efi_rs->GetNextVariableName( + &size, name.str, + cast_guid(&op->u.get_next_variable_name.vendor_guid)); + efi_rs_leave(cr3); - if ( !EFI_ERROR(status) && - copy_to_guest(op->u.get_next_variable_name.name, name.raw, size) ) - rc = -EFAULT; - op->u.get_next_variable_name.size = size; + if ( !EFI_ERROR(status) && + copy_to_guest(op->u.get_next_variable_name.name, + name.raw, size) ) + rc = -EFAULT; + op->u.get_next_variable_name.size = size; + } + else + rc = -EOPNOTSUPP; xfree(name.raw); } @@ -512,7 +552,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) } cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; @@ -531,7 +571,7 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op) return -EINVAL; cr3 = efi_rs_enter(); - if ( (efi_rs->Hdr.Revision >> 16) < 2 ) + if ( !cr3 || (efi_rs->Hdr.Revision >> 16) < 2 ) { efi_rs_leave(cr3); return -EOPNOTSUPP; -- 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 14 09:22:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:22:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5l-0001dG-7w; Fri, 14 Nov 2014 09:22:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5k-0001cZ-HG for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:56 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id F6/E2-14727-FE9C5645; Fri, 14 Nov 2014 09:22:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1415956974!11324342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10750 invoked from network); 14 Nov 2014 09:22:55 -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; 14 Nov 2014 09:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5i-0004mu-2h for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5i-0003Lx-0R for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:54 +0000 Date: Fri, 14 Nov 2014 09:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4237b6310062b27d63ad2bec07fe221b0971955f Author: Don Koch AuthorDate: Thu Nov 13 09:56:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:56:40 2014 +0100 x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions Xen 4.3.0, 4.2.3 and older transferred a maximum sized xsave area (as if all the available XCR0 bits were set); the new version only transfers based on the actual XCR0 bits. This may result in a smaller area if the last sections were missing (e.g., the LWP area from an AMD machine). If the size doesn't match the XCR0 derived size, the size is checked against the maximum size and the part of the xsave area between the actual and maximum used size is checked for zero data. If either the max size check or any part of the overflow area is non-zero, we return with an error. Signed-off-by: Don Koch Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: d7bb8e88a087690feba63ef83c13ba067f041da0 master date: 2014-10-27 16:45:09 +0100 --- xen/arch/x86/hvm/hvm.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a8d58b2..edf6491 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -996,6 +996,7 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; + unsigned int i, desc_start; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1036,15 +1037,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) save_area) + XSTATE_AREA_MIN_SIZE); return -EINVAL; } - size = HVM_CPU_XSAVE_SIZE(xfeature_mask); - if ( desc->length > size ) - { - printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", - d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; - } h->cur += sizeof (*desc); + desc_start = h->cur; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; @@ -1064,10 +1058,24 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); if ( desc->length > size ) { + /* + * Xen 4.3.0, 4.2.3 and older used to send longer-than-needed + * xsave regions. Permit loading the record if the extra data + * is all zero. + */ + for ( i = size; i < desc->length; i++ ) + { + if ( h->data[desc_start + i] ) + { + printk(XENLOG_G_WARNING + "HVM%d.%u restore mismatch: xsave length %#x > %#x (non-zero data at %#x)\n", + d->domain_id, vcpuid, desc->length, size, i); + return -EOPNOTSUPP; + } + } printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", + "HVM%d.%u restore mismatch: xsave length %#x > %#x\n", d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; } /* Checking finished */ @@ -1076,7 +1084,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) 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)); + min(desc->length, size) - offsetof(struct hvm_hw_cpu_xsave, + save_area)); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 09:22:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:22:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5l-0001dG-7w; Fri, 14 Nov 2014 09:22:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5k-0001cZ-HG for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:56 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id F6/E2-14727-FE9C5645; Fri, 14 Nov 2014 09:22:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1415956974!11324342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10750 invoked from network); 14 Nov 2014 09:22:55 -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; 14 Nov 2014 09:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5i-0004mu-2h for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5i-0003Lx-0R for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:22:54 +0000 Date: Fri, 14 Nov 2014 09:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4237b6310062b27d63ad2bec07fe221b0971955f Author: Don Koch AuthorDate: Thu Nov 13 09:56:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:56:40 2014 +0100 x86/HVM: sanity check xsave area when migrating or restoring from older Xen versions Xen 4.3.0, 4.2.3 and older transferred a maximum sized xsave area (as if all the available XCR0 bits were set); the new version only transfers based on the actual XCR0 bits. This may result in a smaller area if the last sections were missing (e.g., the LWP area from an AMD machine). If the size doesn't match the XCR0 derived size, the size is checked against the maximum size and the part of the xsave area between the actual and maximum used size is checked for zero data. If either the max size check or any part of the overflow area is non-zero, we return with an error. Signed-off-by: Don Koch Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: d7bb8e88a087690feba63ef83c13ba067f041da0 master date: 2014-10-27 16:45:09 +0100 --- xen/arch/x86/hvm/hvm.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a8d58b2..edf6491 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -996,6 +996,7 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) struct vcpu *v; struct hvm_hw_cpu_xsave *ctxt; struct hvm_save_descriptor *desc; + unsigned int i, desc_start; /* Which vcpu is this? */ vcpuid = hvm_load_instance(h); @@ -1036,15 +1037,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) save_area) + XSTATE_AREA_MIN_SIZE); return -EINVAL; } - size = HVM_CPU_XSAVE_SIZE(xfeature_mask); - if ( desc->length > size ) - { - printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", - d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; - } h->cur += sizeof (*desc); + desc_start = h->cur; ctxt = (struct hvm_hw_cpu_xsave *)&h->data[h->cur]; h->cur += desc->length; @@ -1064,10 +1058,24 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) size = HVM_CPU_XSAVE_SIZE(ctxt->xcr0_accum); if ( desc->length > size ) { + /* + * Xen 4.3.0, 4.2.3 and older used to send longer-than-needed + * xsave regions. Permit loading the record if the extra data + * is all zero. + */ + for ( i = size; i < desc->length; i++ ) + { + if ( h->data[desc_start + i] ) + { + printk(XENLOG_G_WARNING + "HVM%d.%u restore mismatch: xsave length %#x > %#x (non-zero data at %#x)\n", + d->domain_id, vcpuid, desc->length, size, i); + return -EOPNOTSUPP; + } + } printk(XENLOG_G_WARNING - "HVM%d.%d restore mismatch: xsave length %u > %u\n", + "HVM%d.%u restore mismatch: xsave length %#x > %#x\n", d->domain_id, vcpuid, desc->length, size); - return -EOPNOTSUPP; } /* Checking finished */ @@ -1076,7 +1084,8 @@ static int hvm_load_cpu_xsave_states(struct domain *d, hvm_domain_context_t *h) 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)); + min(desc->length, size) - offsetof(struct hvm_hw_cpu_xsave, + save_area)); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 09:23:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:23: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 1XpD5v-0001fl-BO; Fri, 14 Nov 2014 09:23:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5u-0001fW-J5 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:06 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 7B/90-03148-9F9C5645; Fri, 14 Nov 2014 09:23:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1415956984!12531214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16523 invoked from network); 14 Nov 2014 09: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; 14 Nov 2014 09:23:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5s-0004nT-8j for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5s-0003MW-6F for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:04 +0000 Date: Fri, 14 Nov 2014 09:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] process softirqs while dumping domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb3f33e9cda8cf59d82e52955e2acb3c85123eb0 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:57:36 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:57:36 2014 +0100 process softirqs while dumping domains Process softirqs once per domain, and once every 64 vcpus in a guest to avoid being hit by the NMI watchdog. Discovered against a VM which had accidentally been assigned 8192 vcpus. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli master commit: 9cf71226edabd8b9bc81a5eb57823dacbe8b4bd8 master date: 2014-10-31 11:28:36 +0100 --- xen/common/keyhandler.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 5072133..ad125c7 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -254,6 +254,9 @@ static void dump_domains(unsigned char key) for_each_domain ( d ) { unsigned int i; + + process_pending_softirqs(); + printk("General information for domain %u:\n", d->domain_id); cpuset_print(tmpstr, sizeof(tmpstr), d->domain_dirty_cpumask); printk(" refcnt=%d dying=%d pause_count=%d\n", @@ -288,6 +291,9 @@ static void dump_domains(unsigned char key) d->domain_id); for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk(" VCPU%d: CPU%d [has=%c] poll=%d " "upcall_pend = %02x, upcall_mask = %02x ", v->vcpu_id, v->processor, @@ -310,6 +316,9 @@ static void dump_domains(unsigned char key) { for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk("Notifying guest %d:%d (virq %d, port %d, stat %d/%d/%d)\n", d->domain_id, v->vcpu_id, VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG], -- 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 14 09:23:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:23: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 1XpD5v-0001fl-BO; Fri, 14 Nov 2014 09:23:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5u-0001fW-J5 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:06 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 7B/90-03148-9F9C5645; Fri, 14 Nov 2014 09:23:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1415956984!12531214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16523 invoked from network); 14 Nov 2014 09: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; 14 Nov 2014 09:23:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD5s-0004nT-8j for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD5s-0003MW-6F for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:04 +0000 Date: Fri, 14 Nov 2014 09:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] process softirqs while dumping domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb3f33e9cda8cf59d82e52955e2acb3c85123eb0 Author: Andrew Cooper AuthorDate: Thu Nov 13 09:57:36 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:57:36 2014 +0100 process softirqs while dumping domains Process softirqs once per domain, and once every 64 vcpus in a guest to avoid being hit by the NMI watchdog. Discovered against a VM which had accidentally been assigned 8192 vcpus. Signed-off-by: Andrew Cooper Reviewed-by: Dario Faggioli master commit: 9cf71226edabd8b9bc81a5eb57823dacbe8b4bd8 master date: 2014-10-31 11:28:36 +0100 --- xen/common/keyhandler.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 5072133..ad125c7 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -254,6 +254,9 @@ static void dump_domains(unsigned char key) for_each_domain ( d ) { unsigned int i; + + process_pending_softirqs(); + printk("General information for domain %u:\n", d->domain_id); cpuset_print(tmpstr, sizeof(tmpstr), d->domain_dirty_cpumask); printk(" refcnt=%d dying=%d pause_count=%d\n", @@ -288,6 +291,9 @@ static void dump_domains(unsigned char key) d->domain_id); for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk(" VCPU%d: CPU%d [has=%c] poll=%d " "upcall_pend = %02x, upcall_mask = %02x ", v->vcpu_id, v->processor, @@ -310,6 +316,9 @@ static void dump_domains(unsigned char key) { for_each_vcpu ( d, v ) { + if ( !(v->vcpu_id & 0x3f) ) + process_pending_softirqs(); + printk("Notifying guest %d:%d (virq %d, port %d, stat %d/%d/%d)\n", d->domain_id, v->vcpu_id, VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG], -- 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 14 09:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD68-0001hr-EH; Fri, 14 Nov 2014 09:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD67-0001hh-Gn for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:19 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 07/61-03145-60AC5645; Fri, 14 Nov 2014 09:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1415956995!12505106!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7964 invoked from network); 14 Nov 2014 09:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 09:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD63-0004nZ-AN for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD63-0003N5-6f for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:15 +0000 Date: Fri, 14 Nov 2014 09:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6f9aadf2177f4ec32cefd30343cdfcca4bfc8fa Author: Jan Beulich AuthorDate: Thu Nov 13 09:58:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:58:11 2014 +0100 VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical A recent KVM change by Nadav Amit helped spot that we have the same issue as they did. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 93cc5c6f1641e90eb120826d42f103b7726efb8e master date: 2014-10-31 11:31:11 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 7a2f052..9c5ec60 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2146,9 +2146,13 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) __vmwrite(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: { -- 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 14 09:23:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09:23:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD68-0001hr-EH; Fri, 14 Nov 2014 09:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD67-0001hh-Gn for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:19 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 07/61-03145-60AC5645; Fri, 14 Nov 2014 09:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1415956995!12505106!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7964 invoked from network); 14 Nov 2014 09:23:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Nov 2014 09:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD63-0004nZ-AN for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD63-0003N5-6f for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:15 +0000 Date: Fri, 14 Nov 2014 09:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6f9aadf2177f4ec32cefd30343cdfcca4bfc8fa Author: Jan Beulich AuthorDate: Thu Nov 13 09:58:11 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:58:11 2014 +0100 VMX: values written to MSR_IA32_SYSENTER_E[IS]P should be canonical A recent KVM change by Nadav Amit helped spot that we have the same issue as they did. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: 93cc5c6f1641e90eb120826d42f103b7726efb8e master date: 2014-10-31 11:31:11 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 7a2f052..9c5ec60 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2146,9 +2146,13 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) __vmwrite(GUEST_SYSENTER_CS, msr_content); break; case MSR_IA32_SYSENTER_ESP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_ESP, msr_content); break; case MSR_IA32_SYSENTER_EIP: + if ( !is_canonical_address(msr_content) ) + goto gp_fault; __vmwrite(GUEST_SYSENTER_EIP, msr_content); break; case MSR_IA32_DEBUGCTLMSR: { -- 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 14 09:23:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD6H-0001j8-Gq; Fri, 14 Nov 2014 09: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 1XpD6F-0001is-Up for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:28 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E1/CE-02702-F0AC5645; Fri, 14 Nov 2014 09:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1415957005!9187126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15082 invoked from network); 14 Nov 2014 09:23:26 -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; 14 Nov 2014 09:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD6D-0004nf-FI for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD6D-0003NY-E9 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:25 +0000 Date: Fri, 14 Nov 2014 09:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: only kill guest when unknown VM exit occurred in guest kernel 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 d6281e354393f1c8a02fac55f4f611b4d4856303 Author: Jan Beulich AuthorDate: Thu Nov 13 09:58:56 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:58:56 2014 +0100 x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode A recent KVM change by Nadav Amit pointed out that unconditional VM exits (like VMX'es ones for the INVEPT, INVVPID, and XSETBV instructions) may result from guest user mode activity (in the example cases, e.g. prior to a privilege level check being done). Consequently convert the unconditional domain_crash() to a conditional one (when guest is in kernel mode) with the alternative of injecting #UD (when in user mode). This is meant to be a precaution against in-guest security issues introduced when any such VM exit becomes possible (on newer hardware) without the hypervisor immediately being aware of it. There are no such unhandled VM exits currently (and hence this is not an active security issue), but old (no longer security maintained) versions exhibit issues in the cases given as examples above. Suggested-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian master commit: 5283b310e14884341f51be35253cdd59c4cb034c master date: 2014-10-31 11:32:27 +0100 --- xen/arch/x86/hvm/svm/svm.c | 6 +++++- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 0e7fb0c..30e130f 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2458,7 +2458,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - domain_crash(v->domain); + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9c5ec60..7f38378 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2958,8 +2958,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#x)\n", exit_reason); - domain_crash(v->domain); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#x)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Nov 14 09:23:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 14 Nov 2014 09: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 1XpD6H-0001j8-Gq; Fri, 14 Nov 2014 09: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 1XpD6F-0001is-Up for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:28 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E1/CE-02702-F0AC5645; Fri, 14 Nov 2014 09:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1415957005!9187126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15082 invoked from network); 14 Nov 2014 09:23:26 -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; 14 Nov 2014 09:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XpD6D-0004nf-FI for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XpD6D-0003NY-E9 for xen-changelog@lists.xensource.com; Fri, 14 Nov 2014 09:23:25 +0000 Date: Fri, 14 Nov 2014 09:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: only kill guest when unknown VM exit occurred in guest kernel 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 d6281e354393f1c8a02fac55f4f611b4d4856303 Author: Jan Beulich AuthorDate: Thu Nov 13 09:58:56 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 13 09:58:56 2014 +0100 x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode A recent KVM change by Nadav Amit pointed out that unconditional VM exits (like VMX'es ones for the INVEPT, INVVPID, and XSETBV instructions) may result from guest user mode activity (in the example cases, e.g. prior to a privilege level check being done). Consequently convert the unconditional domain_crash() to a conditional one (when guest is in kernel mode) with the alternative of injecting #UD (when in user mode). This is meant to be a precaution against in-guest security issues introduced when any such VM exit becomes possible (on newer hardware) without the hypervisor immediately being aware of it. There are no such unhandled VM exits currently (and hence this is not an active security issue), but old (no longer security maintained) versions exhibit issues in the cases given as examples above. Suggested-by: Tim Deegan Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian master commit: 5283b310e14884341f51be35253cdd59c4cb034c master date: 2014-10-31 11:32:27 +0100 --- xen/arch/x86/hvm/svm/svm.c | 6 +++++- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 0e7fb0c..30e130f 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2458,7 +2458,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - domain_crash(v->domain); + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9c5ec60..7f38378 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2958,8 +2958,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_ERR, "Bad vmexit (reason %#x)\n", exit_reason); - domain_crash(v->domain); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#x)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 17 05:22:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Nov 2014 05:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqElN-0005R5-VK; Mon, 17 Nov 2014 05:22:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqElM-0005Qp-4Z for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 05:22:08 +0000 Content-Length: 7376 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id D9/75-07724-FF589645; Mon, 17 Nov 2014 05:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1416201724!11725629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20650 invoked from network); 17 Nov 2014 05:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2014 05:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqElG-0005Ta-EM for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 05:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqElG-0000Ua-9D for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 05:22:02 +0000 Date: Mon, 17 Nov 2014 05:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_disk: fix unmapping of persistent grants X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2444999308667509431==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2444999308667509431== Content-Length: 7099 Content-Transfer-Encoding: quoted-printable commit abbbc2f09a53f8f9ee565356ab11a78af006e45e Author: Roger Pau Monne AuthorDate: Thu Nov 13 18:42:09 2014 +0100 Commit: Stefano Stabellini CommitDate: Fri Nov 14 13:58:25 2014 +0000 xen_disk: fix unmapping of persistent grants This patch fixes two issues with persistent grants and the disk PV backend (Qdisk): - Keep track of memory regions where persistent grants have been mapped since we need to unmap them as a whole. It is not possible to unmap a single grant if it has been batch-mapped. A new check has also been added to make sure persistent grants are only used if the whole mapped region can be persistently mapped in the batch_maps case. - Unmap persistent grants before switching to the closed state, so the frontend can also free them. upstream-commit-id: 2f01dfacb56bc7a0d4639adc9dff9aae131e6216 Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Stefano Stabellini Release-Acked-by: Konrad Rzeszutek Wilk Reported-by: George Dunlap Cc: Kevin Wolf Cc: Stefan Hajnoczi Cc: George Dunlap Cc: Konrad Rzeszutek Wilk --- hw/block/xen_disk.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 66 insertions(+), 6 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 186d7c9..d90f2cd 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -58,6 +58,13 @@ struct PersistentGrant { typedef struct PersistentGrant PersistentGrant; +struct PersistentRegion { + void *addr; + int num; +}; + +typedef struct PersistentRegion PersistentRegion; + struct ioreq { blkif_request_t req; int16_t status; @@ -117,6 +124,7 @@ struct XenBlkDev { gboolean feature_discard; gboolean feature_persistent; GTree *persistent_gnts; + GSList *persistent_regions; unsigned int persistent_gnt_count; unsigned int max_grants; @@ -176,6 +184,23 @@ static void destroy_grant(gpointer pgnt) g_free(grant); } +static void remove_persistent_region(gpointer data, gpointer dev) +{ + PersistentRegion *region =3D data; + struct XenBlkDev *blkdev =3D dev; + XenGnttab gnt =3D blkdev->xendev.gnttabdev; + + if (xc_gnttab_munmap(gnt, region->addr, region->num) !=3D 0) { + xen_be_printf(&blkdev->xendev, 0, + "xc_gnttab_munmap region %p failed: %s\n", + region->addr, strerror(errno)); + } + xen_be_printf(&blkdev->xendev, 3, + "unmapped grant region %p with %d pages\n", + region->addr, region->num); + g_free(region); +} + static struct ioreq *ioreq_start(struct XenBlkDev *blkdev) { struct ioreq *ioreq =3D NULL; @@ -342,6 +367,7 @@ static int ioreq_map(struct ioreq *ioreq) void *page[BLKIF_MAX_SEGMENTS_PER_REQUEST]; int i, j, new_maps =3D 0; PersistentGrant *grant; + PersistentRegion *region; /* domids and refs variables will contain the information necessary * to map the grants that are needed to fulfill this request. * @@ -420,7 +446,22 @@ static int ioreq_map(struct ioreq *ioreq) } } } - if (ioreq->blkdev->feature_persistent) { + if (ioreq->blkdev->feature_persistent && new_maps !=3D 0 && + (!batch_maps || (ioreq->blkdev->persistent_gnt_count + new_maps <=3D + ioreq->blkdev->max_grants))) { + /* + * If we are using persistent grants and batch mappings only + * add the new maps to the list of persistent grants if the whole + * area can be persistently mapped. + */ + if (batch_maps) { + region =3D g_malloc0(sizeof(*region)); + region->addr =3D ioreq->pages; + region->num =3D new_maps; + ioreq->blkdev->persistent_regions =3D g_slist_append( + ioreq->blkdev->persistent_regions, + region); + } while ((ioreq->blkdev->persistent_gnt_count < ioreq->blkdev->max_grants) && new_maps) { /* Go through the list of newly mapped grants and add as many @@ -446,6 +487,7 @@ static int ioreq_map(struct ioreq *ioreq) grant); ioreq->blkdev->persistent_gnt_count++; } + assert(!batch_maps || new_maps =3D=3D 0); } for (i =3D 0; i < ioreq->v.niov; i++) { ioreq->v.iov[i].iov_base +=3D (uintptr_t)page[i]; @@ -962,7 +1004,10 @@ static int blk_connect(struct XenDevice *xendev) blkdev->max_grants =3D max_requests * BLKIF_MAX_SEGMENTS_PER_REQUEST; blkdev->persistent_gnts =3D g_tree_new_full((GCompareDataFunc)int_cmp, NULL, NULL, + batch_maps =3F + (GDestroyNotify)g_free : (GDestroyNotify)destroy_grant); + blkdev->persistent_regions =3D NULL; blkdev->persistent_gnt_count =3D 0; } @@ -991,6 +1036,26 @@ static void blk_disconnect(struct XenDevice *xendev) blkdev->cnt_map--; blkdev->sring =3D NULL; } + + /* + * Unmap persistent grants before switching to the closed state + * so the frontend can free them. + * + * In the !batch_maps case g_tree_destroy will take care of unmapping + * the grant, but in the batch_maps case we need to iterate over every + * region in persistent_regions and unmap it. + */ + if (blkdev->feature_persistent) { + g_tree_destroy(blkdev->persistent_gnts); + assert(batch_maps || blkdev->persistent_gnt_count =3D=3D 0); + if (batch_maps) { + blkdev->persistent_gnt_count =3D 0; + g_slist_foreach(blkdev->persistent_regions, + (GFunc)remove_persistent_region, blkdev); + g_slist_free(blkdev->persistent_regions); + } + blkdev->feature_persistent =3D false; + } } static int blk_free(struct XenDevice *xendev) @@ -1002,11 +1067,6 @@ static int blk_free(struct XenDevice *xendev) blk_disconnect(xendev); } - /* Free persistent grants */ - if (blkdev->feature_persistent) { - g_tree_destroy(blkdev->persistent_gnts); - } - while (!QLIST_EMPTY(&blkdev->freelist)) { ioreq =3D QLIST_FIRST(&blkdev->freelist); QLIST_REMOVE(ioreq, list); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============2444999308667509431== 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 --===============2444999308667509431==-- From xen-changelog-bounces@lists.xen.org Mon Nov 17 05:22:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Nov 2014 05:22:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqElN-0005R5-VK; Mon, 17 Nov 2014 05:22:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqElM-0005Qp-4Z for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 05:22:08 +0000 Content-Length: 7376 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id D9/75-07724-FF589645; Mon, 17 Nov 2014 05:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1416201724!11725629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20650 invoked from network); 17 Nov 2014 05:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2014 05:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqElG-0005Ta-EM for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 05:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqElG-0000Ua-9D for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 05:22:02 +0000 Date: Mon, 17 Nov 2014 05:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] xen_disk: fix unmapping of persistent grants X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2444999308667509431==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2444999308667509431== Content-Length: 7099 Content-Transfer-Encoding: quoted-printable commit abbbc2f09a53f8f9ee565356ab11a78af006e45e Author: Roger Pau Monne AuthorDate: Thu Nov 13 18:42:09 2014 +0100 Commit: Stefano Stabellini CommitDate: Fri Nov 14 13:58:25 2014 +0000 xen_disk: fix unmapping of persistent grants This patch fixes two issues with persistent grants and the disk PV backend (Qdisk): - Keep track of memory regions where persistent grants have been mapped since we need to unmap them as a whole. It is not possible to unmap a single grant if it has been batch-mapped. A new check has also been added to make sure persistent grants are only used if the whole mapped region can be persistently mapped in the batch_maps case. - Unmap persistent grants before switching to the closed state, so the frontend can also free them. upstream-commit-id: 2f01dfacb56bc7a0d4639adc9dff9aae131e6216 Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Stefano Stabellini Release-Acked-by: Konrad Rzeszutek Wilk Reported-by: George Dunlap Cc: Kevin Wolf Cc: Stefan Hajnoczi Cc: George Dunlap Cc: Konrad Rzeszutek Wilk --- hw/block/xen_disk.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 66 insertions(+), 6 deletions(-) diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index 186d7c9..d90f2cd 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -58,6 +58,13 @@ struct PersistentGrant { typedef struct PersistentGrant PersistentGrant; +struct PersistentRegion { + void *addr; + int num; +}; + +typedef struct PersistentRegion PersistentRegion; + struct ioreq { blkif_request_t req; int16_t status; @@ -117,6 +124,7 @@ struct XenBlkDev { gboolean feature_discard; gboolean feature_persistent; GTree *persistent_gnts; + GSList *persistent_regions; unsigned int persistent_gnt_count; unsigned int max_grants; @@ -176,6 +184,23 @@ static void destroy_grant(gpointer pgnt) g_free(grant); } +static void remove_persistent_region(gpointer data, gpointer dev) +{ + PersistentRegion *region =3D data; + struct XenBlkDev *blkdev =3D dev; + XenGnttab gnt =3D blkdev->xendev.gnttabdev; + + if (xc_gnttab_munmap(gnt, region->addr, region->num) !=3D 0) { + xen_be_printf(&blkdev->xendev, 0, + "xc_gnttab_munmap region %p failed: %s\n", + region->addr, strerror(errno)); + } + xen_be_printf(&blkdev->xendev, 3, + "unmapped grant region %p with %d pages\n", + region->addr, region->num); + g_free(region); +} + static struct ioreq *ioreq_start(struct XenBlkDev *blkdev) { struct ioreq *ioreq =3D NULL; @@ -342,6 +367,7 @@ static int ioreq_map(struct ioreq *ioreq) void *page[BLKIF_MAX_SEGMENTS_PER_REQUEST]; int i, j, new_maps =3D 0; PersistentGrant *grant; + PersistentRegion *region; /* domids and refs variables will contain the information necessary * to map the grants that are needed to fulfill this request. * @@ -420,7 +446,22 @@ static int ioreq_map(struct ioreq *ioreq) } } } - if (ioreq->blkdev->feature_persistent) { + if (ioreq->blkdev->feature_persistent && new_maps !=3D 0 && + (!batch_maps || (ioreq->blkdev->persistent_gnt_count + new_maps <=3D + ioreq->blkdev->max_grants))) { + /* + * If we are using persistent grants and batch mappings only + * add the new maps to the list of persistent grants if the whole + * area can be persistently mapped. + */ + if (batch_maps) { + region =3D g_malloc0(sizeof(*region)); + region->addr =3D ioreq->pages; + region->num =3D new_maps; + ioreq->blkdev->persistent_regions =3D g_slist_append( + ioreq->blkdev->persistent_regions, + region); + } while ((ioreq->blkdev->persistent_gnt_count < ioreq->blkdev->max_grants) && new_maps) { /* Go through the list of newly mapped grants and add as many @@ -446,6 +487,7 @@ static int ioreq_map(struct ioreq *ioreq) grant); ioreq->blkdev->persistent_gnt_count++; } + assert(!batch_maps || new_maps =3D=3D 0); } for (i =3D 0; i < ioreq->v.niov; i++) { ioreq->v.iov[i].iov_base +=3D (uintptr_t)page[i]; @@ -962,7 +1004,10 @@ static int blk_connect(struct XenDevice *xendev) blkdev->max_grants =3D max_requests * BLKIF_MAX_SEGMENTS_PER_REQUEST; blkdev->persistent_gnts =3D g_tree_new_full((GCompareDataFunc)int_cmp, NULL, NULL, + batch_maps =3F + (GDestroyNotify)g_free : (GDestroyNotify)destroy_grant); + blkdev->persistent_regions =3D NULL; blkdev->persistent_gnt_count =3D 0; } @@ -991,6 +1036,26 @@ static void blk_disconnect(struct XenDevice *xendev) blkdev->cnt_map--; blkdev->sring =3D NULL; } + + /* + * Unmap persistent grants before switching to the closed state + * so the frontend can free them. + * + * In the !batch_maps case g_tree_destroy will take care of unmapping + * the grant, but in the batch_maps case we need to iterate over every + * region in persistent_regions and unmap it. + */ + if (blkdev->feature_persistent) { + g_tree_destroy(blkdev->persistent_gnts); + assert(batch_maps || blkdev->persistent_gnt_count =3D=3D 0); + if (batch_maps) { + blkdev->persistent_gnt_count =3D 0; + g_slist_foreach(blkdev->persistent_regions, + (GFunc)remove_persistent_region, blkdev); + g_slist_free(blkdev->persistent_regions); + } + blkdev->feature_persistent =3D false; + } } static int blk_free(struct XenDevice *xendev) @@ -1002,11 +1067,6 @@ static int blk_free(struct XenDevice *xendev) blk_disconnect(xendev); } - /* Free persistent grants */ - if (blkdev->feature_persistent) { - g_tree_destroy(blkdev->persistent_gnts); - } - while (!QLIST_EMPTY(&blkdev->freelist)) { ioreq =3D QLIST_FIRST(&blkdev->freelist); QLIST_REMOVE(ioreq, list); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============2444999308667509431== 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 --===============2444999308667509431==-- From xen-changelog-bounces@lists.xen.org Mon Nov 17 11:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Nov 2014 11:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqKYQ-0006qA-Cc; Mon, 17 Nov 2014 11:33:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqKYO-0006px-TX for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 11:33:09 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 11/BD-17958-4FCD9645; Mon, 17 Nov 2014 11:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1416223985!8136852!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14233 invoked from network); 17 Nov 2014 11:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2014 11:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqKYI-0001QK-Qn for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 11:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqKYI-0005lf-NZ for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 11:33:02 +0000 Date: Mon, 17 Nov 2014 11:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c844974caf1501b6527533ab2a3d27ea8920ab90 Author: Jan Beulich AuthorDate: Fri Oct 31 11:23:17 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:23:17 2014 +0100 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). Note that the tying of the continuations to the invoking domain (which previously [wrongly] used the invoking vCPU instead) implies that the tools requesting such operations have to make sure they don't issue multiple similar operations in parallel. Note further that this breaks supervisor-mode kernel assumptions in hypercall_create_continuation() (where regs->eip gets rewound to the current hypercall stub beginning), but otoh hypercall_cancel_continuation() doesn't work in that mode either. Perhaps time to rip out all the remains of that feature? This is part of CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Tested-by: Andrew Cooper master commit: 070493dfd2788e061b53f074b7ba97507fbcbf65 master date: 2014-10-06 11:22:04 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 8 +- xen/arch/x86/hvm/hvm.c | 9 +- xen/arch/x86/mm/paging.c | 261 +++++++++++++++++++++++++++++------- xen/arch/x86/x86_32/entry.S | 2 + xen/arch/x86/x86_64/compat/entry.S | 2 + xen/arch/x86/x86_64/entry.S | 2 + xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 ++ xen/include/asm-x86/paging.h | 13 +- 10 files changed, 254 insertions(+), 62 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8f11473..2799e86 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2136,7 +2136,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 48de4bf..8bf8f09 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -62,10 +62,12 @@ long arch_do_domctl( d = rcu_lock_domain_by_id(domctl->domain); if ( d != NULL ) { - ret = paging_domctl(d, - &domctl->u.shadow_op, - guest_handle_cast(u_domctl, void)); + ret = paging_domctl(d, &domctl->u.shadow_op, + guest_handle_cast(u_domctl, void), 0); rcu_unlock_domain(d); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_arch_1, + "h", u_domctl); copy_to_guest(u_domctl, domctl, 1); } } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index edef31b..4be249e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3210,7 +3210,8 @@ static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = { HYPERCALL(set_timer_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), - HYPERCALL(tmem_op) + HYPERCALL(tmem_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; #else /* defined(__x86_64__) */ @@ -3295,7 +3296,8 @@ static hvm_hypercall_t *hvm_hypercall64_table[NR_hypercalls] = { HYPERCALL(set_timer_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), - HYPERCALL(tmem_op) + HYPERCALL(tmem_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; #define COMPAT_CALL(x) \ @@ -3312,7 +3314,8 @@ static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = { COMPAT_CALL(set_timer_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), - HYPERCALL(tmem_op) + HYPERCALL(tmem_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; #endif /* defined(__x86_64__) */ diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 0fd1199..e7d3a2b 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.dom ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.dom != current->domain || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.dom = NULL; + } + else + { + d->arch.paging.preempt.dom = current->domain; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + if ( paging_mode_log_dirty(d) ) + { + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } + } + + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.dom ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.dom != current->domain || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -348,12 +428,6 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) sc->stats.fault_count = d->arch.paging.log_dirty.fault_count; sc->stats.dirty_count = d->arch.paging.log_dirty.dirty_count; - if ( clean ) - { - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; - } - if ( guest_handle_is_null(sc->dirty_bitmap) ) /* caller may have wanted just to clean the state or access stats. */ peek = 0; @@ -365,17 +439,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +482,58 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + { + d->arch.paging.preempt.dom = NULL; + if ( clean ) + { + d->arch.paging.log_dirty.fault_count = 0; + d->arch.paging.log_dirty.dirty_count = 0; + } + } + else + { + d->arch.paging.preempt.dom = current->domain; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused on real errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +544,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.dom = NULL; paging_unlock(d); domain_unpause(d); @@ -498,12 +611,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -545,7 +652,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, - XEN_GUEST_HANDLE(void) u_domctl) + XEN_GUEST_HANDLE(void) u_domctl, bool_t resuming) { int rc; @@ -569,6 +676,21 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( resuming + ? (d->arch.paging.preempt.dom != current->domain || + d->arch.paging.preempt.op != sc->op) + : (d->arch.paging.preempt.dom && + sc->op != XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION) ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x by Dom%u\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op, + d->arch.paging.preempt.dom + ? d->arch.paging.preempt.dom->domain_id : DOMID_INVALID); + return -EBUSY; + } + rc = xsm_shadow_control(d, sc->op); if ( rc ) return rc; @@ -593,14 +715,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return paging_log_dirty_enable(d); case XEN_DOMCTL_SHADOW_OP_OFF: - if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) - return rc; + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -610,19 +731,67 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return shadow_domctl(d, sc, u_domctl); } +long paging_domctl_continuation(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) +{ + struct xen_domctl op; + struct domain *d; + int ret; + + if ( copy_from_guest(&op, u_domctl, 1) ) + return -EFAULT; + + if ( op.interface_version != XEN_DOMCTL_INTERFACE_VERSION || + op.cmd != XEN_DOMCTL_shadow_op ) + return -EBADRQC; + + d = rcu_lock_domain_by_id(op.domain); + if ( d == NULL ) + return -ESRCH; + + ret = xsm_domctl(d, op.cmd); + if ( !ret ) + { + if ( domctl_lock_acquire() ) + { + ret = paging_domctl(d, &op.u.shadow_op, + guest_handle_cast(u_domctl, void), 1); + + domctl_lock_release(); + } + else + ret = -EAGAIN; + } + + rcu_unlock_domain(d); + + if ( ret == -EAGAIN ) + ret = hypercall_create_continuation(__HYPERVISOR_arch_1, + "h", u_domctl); + else if ( __copy_field_to_guest(u_domctl, &op, u.shadow_op) ) + ret = -EFAULT; + + return ret; +} + /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index b460966..e92eec2 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -728,6 +728,7 @@ ENTRY(hypercall_table) .long do_ni_hypercall .endr .long do_mca /* 48 */ + .long paging_domctl_continuation .rept NR_hypercalls-((.-hypercall_table)/4) .long do_ni_hypercall .endr @@ -776,6 +777,7 @@ ENTRY(hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr .byte 1 /* do_mca */ /* 48 */ + .byte 1 /* paging_domctl_continuation */ .rept NR_hypercalls-(.-hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 4482f6e..4e1e90e 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -418,6 +418,7 @@ ENTRY(compat_hypercall_table) .quad compat_ni_hypercall .endr .quad do_mca /* 48 */ + .quad paging_domctl_continuation .rept NR_hypercalls-((.-compat_hypercall_table)/8) .quad compat_ni_hypercall .endr @@ -466,6 +467,7 @@ ENTRY(compat_hypercall_args_table) .byte 0 /* compat_ni_hypercall */ .endr .byte 1 /* do_mca */ + .byte 1 /* paging_domctl_continuation */ .rept NR_hypercalls-(.-compat_hypercall_args_table) .byte 0 /* compat_ni_hypercall */ .endr diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 85e9a17..b8e8959 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -749,6 +749,7 @@ ENTRY(hypercall_table) .quad do_ni_hypercall .endr .quad do_mca /* 48 */ + .quad paging_domctl_continuation .rept NR_hypercalls-((.-hypercall_table)/8) .quad do_ni_hypercall .endr @@ -797,6 +798,7 @@ ENTRY(hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr .byte 1 /* do_mca */ /* 48 */ + .byte 1 /* paging_domctl_continuation */ .rept NR_hypercalls-(.-hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr diff --git a/xen/common/domain.c b/xen/common/domain.c index 73842f9..45d90bf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -479,7 +479,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 6c62c25..5c8232d 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -193,6 +193,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + const struct domain *dom; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 1e77e78..a8a95f7 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -141,9 +141,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -153,9 +150,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -215,10 +209,13 @@ int paging_domain_init(struct domain *d, unsigned int domcr_flags); * and disable ephemeral shadow modes (test mode and log-dirty mode) and * manipulate the log-dirty bitmap. */ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, - XEN_GUEST_HANDLE(void) u_domctl); + XEN_GUEST_HANDLE(void) u_domctl, bool_t resuming); + +/* Helper hypercall for dealing with continuations. */ +long paging_domctl_continuation(XEN_GUEST_HANDLE(xen_domctl_t)); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 17 11:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 17 Nov 2014 11:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqKYQ-0006qA-Cc; Mon, 17 Nov 2014 11:33:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqKYO-0006px-TX for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 11:33:09 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 11/BD-17958-4FCD9645; Mon, 17 Nov 2014 11:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1416223985!8136852!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14233 invoked from network); 17 Nov 2014 11:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Nov 2014 11:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqKYI-0001QK-Qn for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 11:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqKYI-0005lf-NZ for xen-changelog@lists.xensource.com; Mon, 17 Nov 2014 11:33:02 +0000 Date: Mon, 17 Nov 2014 11:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/paging: make log-dirty operations preemptible X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c844974caf1501b6527533ab2a3d27ea8920ab90 Author: Jan Beulich AuthorDate: Fri Oct 31 11:23:17 2014 +0100 Commit: Jan Beulich CommitDate: Fri Oct 31 11:23:17 2014 +0100 x86/paging: make log-dirty operations preemptible Both the freeing and the inspection of the bitmap get done in (nested) loops which - besides having a rather high iteration count in general, albeit that would be covered by XSA-77 - have the number of non-trivial iterations they need to perform (indirectly) controllable by both the guest they are for and any domain controlling the guest (including the one running qemu for it). Note that the tying of the continuations to the invoking domain (which previously [wrongly] used the invoking vCPU instead) implies that the tools requesting such operations have to make sure they don't issue multiple similar operations in parallel. Note further that this breaks supervisor-mode kernel assumptions in hypercall_create_continuation() (where regs->eip gets rewound to the current hypercall stub beginning), but otoh hypercall_cancel_continuation() doesn't work in that mode either. Perhaps time to rip out all the remains of that feature? This is part of CVE-2014-5146 / XSA-97. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Tested-by: Andrew Cooper master commit: 070493dfd2788e061b53f074b7ba97507fbcbf65 master date: 2014-10-06 11:22:04 +0200 --- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 8 +- xen/arch/x86/hvm/hvm.c | 9 +- xen/arch/x86/mm/paging.c | 261 +++++++++++++++++++++++++++++------- xen/arch/x86/x86_32/entry.S | 2 + xen/arch/x86/x86_64/compat/entry.S | 2 + xen/arch/x86/x86_64/entry.S | 2 + xen/common/domain.c | 1 - xen/include/asm-x86/domain.h | 14 ++ xen/include/asm-x86/paging.h | 13 +- 10 files changed, 254 insertions(+), 62 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 8f11473..2799e86 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -2136,7 +2136,9 @@ int domain_relinquish_resources(struct domain *d) pci_release_devices(d); /* Tear down paging-assistance stuff. */ - paging_teardown(d); + ret = paging_teardown(d); + if ( ret ) + return ret; /* Drop the in-use references to page-table bases. */ for_each_vcpu ( d, v ) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 48de4bf..8bf8f09 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -62,10 +62,12 @@ long arch_do_domctl( d = rcu_lock_domain_by_id(domctl->domain); if ( d != NULL ) { - ret = paging_domctl(d, - &domctl->u.shadow_op, - guest_handle_cast(u_domctl, void)); + ret = paging_domctl(d, &domctl->u.shadow_op, + guest_handle_cast(u_domctl, void), 0); rcu_unlock_domain(d); + if ( ret == -EAGAIN ) + return hypercall_create_continuation(__HYPERVISOR_arch_1, + "h", u_domctl); copy_to_guest(u_domctl, domctl, 1); } } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index edef31b..4be249e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3210,7 +3210,8 @@ static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = { HYPERCALL(set_timer_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), - HYPERCALL(tmem_op) + HYPERCALL(tmem_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; #else /* defined(__x86_64__) */ @@ -3295,7 +3296,8 @@ static hvm_hypercall_t *hvm_hypercall64_table[NR_hypercalls] = { HYPERCALL(set_timer_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), - HYPERCALL(tmem_op) + HYPERCALL(tmem_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; #define COMPAT_CALL(x) \ @@ -3312,7 +3314,8 @@ static hvm_hypercall_t *hvm_hypercall32_table[NR_hypercalls] = { COMPAT_CALL(set_timer_op), HYPERCALL(hvm_op), HYPERCALL(sysctl), - HYPERCALL(tmem_op) + HYPERCALL(tmem_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; #endif /* defined(__x86_64__) */ diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 0fd1199..e7d3a2b 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -116,26 +117,46 @@ static void paging_free_log_dirty_page(struct domain *d, mfn_t mfn) d->arch.paging.free_page(d, mfn_to_page(mfn)); } -void paging_free_log_dirty_bitmap(struct domain *d) +static int paging_free_log_dirty_bitmap(struct domain *d, int rc) { mfn_t *l4, *l3, *l2; int i4, i3, i2; + paging_lock(d); + if ( !mfn_valid(d->arch.paging.log_dirty.top) ) - return; + { + paging_unlock(d); + return 0; + } - paging_lock(d); + if ( !d->arch.paging.preempt.dom ) + { + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + ASSERT(rc <= 0); + d->arch.paging.preempt.log_dirty.done = -rc; + } + else if ( d->arch.paging.preempt.dom != current->domain || + d->arch.paging.preempt.op != XEN_DOMCTL_SHADOW_OP_OFF ) + { + paging_unlock(d); + return -EBUSY; + } l4 = map_domain_page(mfn_x(d->arch.paging.log_dirty.top)); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + rc = 0; - for ( i4 = 0; i4 < LOGDIRTY_NODE_ENTRIES; i4++ ) + for ( ; i4 < LOGDIRTY_NODE_ENTRIES; i4++, i3 = 0 ) { if ( !mfn_valid(l4[i4]) ) continue; l3 = map_domain_page(mfn_x(l4[i4])); - for ( i3 = 0; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) + for ( ; i3 < LOGDIRTY_NODE_ENTRIES; i3++ ) { if ( !mfn_valid(l3[i3]) ) continue; @@ -148,20 +169,54 @@ void paging_free_log_dirty_bitmap(struct domain *d) unmap_domain_page(l2); paging_free_log_dirty_page(d, l3[i3]); + l3[i3] = _mfn(INVALID_MFN); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + d->arch.paging.preempt.log_dirty.i4 = i4; + rc = -EAGAIN; + break; + } } unmap_domain_page(l3); + if ( rc ) + break; paging_free_log_dirty_page(d, l4[i4]); + l4[i4] = _mfn(INVALID_MFN); + + if ( i4 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i3 = 0; + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + rc = -EAGAIN; + break; + } } unmap_domain_page(l4); - paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); - d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); - ASSERT(d->arch.paging.log_dirty.allocs == 0); - d->arch.paging.log_dirty.failed_allocs = 0; + if ( !rc ) + { + paging_free_log_dirty_page(d, d->arch.paging.log_dirty.top); + d->arch.paging.log_dirty.top = _mfn(INVALID_MFN); + + ASSERT(d->arch.paging.log_dirty.allocs == 0); + d->arch.paging.log_dirty.failed_allocs = 0; + + rc = -d->arch.paging.preempt.log_dirty.done; + d->arch.paging.preempt.dom = NULL; + } + else + { + d->arch.paging.preempt.dom = current->domain; + d->arch.paging.preempt.op = XEN_DOMCTL_SHADOW_OP_OFF; + } paging_unlock(d); + + return rc; } int paging_log_dirty_enable(struct domain *d) @@ -178,15 +233,25 @@ int paging_log_dirty_enable(struct domain *d) return ret; } -int paging_log_dirty_disable(struct domain *d) +static int paging_log_dirty_disable(struct domain *d, bool_t resuming) { - int ret; + int ret = 1; + + if ( !resuming ) + { + domain_pause(d); + /* Safe because the domain is paused. */ + if ( paging_mode_log_dirty(d) ) + { + ret = d->arch.paging.log_dirty.disable_log_dirty(d); + ASSERT(ret <= 0); + } + } + + ret = paging_free_log_dirty_bitmap(d, ret); + if ( ret == -EAGAIN ) + return ret; - domain_pause(d); - /* Safe because the domain is paused. */ - ret = d->arch.paging.log_dirty.disable_log_dirty(d); - if ( !paging_mode_log_dirty(d) ) - paging_free_log_dirty_bitmap(d); domain_unpause(d); return ret; @@ -326,7 +391,9 @@ int paging_mfn_is_dirty(struct domain *d, mfn_t gmfn) /* Read a domain's log-dirty bitmap and stats. If the operation is a CLEAN, * clear the bitmap and stats as well. */ -int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) +static int paging_log_dirty_op(struct domain *d, + struct xen_domctl_shadow_op *sc, + bool_t resuming) { int rv = 0, clean = 0, peek = 1; unsigned long pages = 0; @@ -334,9 +401,22 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) unsigned long *l1 = NULL; int i4, i3, i2; - domain_pause(d); + if ( !resuming ) + domain_pause(d); paging_lock(d); + if ( !d->arch.paging.preempt.dom ) + memset(&d->arch.paging.preempt.log_dirty, 0, + sizeof(d->arch.paging.preempt.log_dirty)); + else if ( d->arch.paging.preempt.dom != current->domain || + d->arch.paging.preempt.op != sc->op ) + { + paging_unlock(d); + ASSERT(!resuming); + domain_unpause(d); + return -EBUSY; + } + clean = (sc->op == XEN_DOMCTL_SHADOW_OP_CLEAN); PAGING_DEBUG(LOGDIRTY, "log-dirty %s: dom %u faults=%u dirty=%u\n", @@ -348,12 +428,6 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) sc->stats.fault_count = d->arch.paging.log_dirty.fault_count; sc->stats.dirty_count = d->arch.paging.log_dirty.dirty_count; - if ( clean ) - { - d->arch.paging.log_dirty.fault_count = 0; - d->arch.paging.log_dirty.dirty_count = 0; - } - if ( guest_handle_is_null(sc->dirty_bitmap) ) /* caller may have wanted just to clean the state or access stats. */ peek = 0; @@ -365,17 +439,15 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) goto out; } - pages = 0; l4 = paging_map_log_dirty_bitmap(d); + i4 = d->arch.paging.preempt.log_dirty.i4; + i3 = d->arch.paging.preempt.log_dirty.i3; + pages = d->arch.paging.preempt.log_dirty.done; - for ( i4 = 0; - (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); - i4++ ) + for ( ; (pages < sc->pages) && (i4 < LOGDIRTY_NODE_ENTRIES); i4++, i3 = 0 ) { l3 = (l4 && mfn_valid(l4[i4])) ? map_domain_page(mfn_x(l4[i4])) : NULL; - for ( i3 = 0; - (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); - i3++ ) + for ( ; (pages < sc->pages) && (i3 < LOGDIRTY_NODE_ENTRIES); i3++ ) { l2 = ((l3 && mfn_valid(l3[i3])) ? map_domain_page(mfn_x(l3[i3])) : NULL); @@ -410,18 +482,58 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) } if ( l2 ) unmap_domain_page(l2); + + if ( i3 < LOGDIRTY_NODE_ENTRIES - 1 && hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4; + d->arch.paging.preempt.log_dirty.i3 = i3 + 1; + rv = -EAGAIN; + break; + } } if ( l3 ) unmap_domain_page(l3); + + if ( !rv && i4 < LOGDIRTY_NODE_ENTRIES - 1 && + hypercall_preempt_check() ) + { + d->arch.paging.preempt.log_dirty.i4 = i4 + 1; + d->arch.paging.preempt.log_dirty.i3 = 0; + rv = -EAGAIN; + } + if ( rv ) + break; } if ( l4 ) unmap_domain_page(l4); - if ( pages < sc->pages ) - sc->pages = pages; + if ( !rv ) + { + d->arch.paging.preempt.dom = NULL; + if ( clean ) + { + d->arch.paging.log_dirty.fault_count = 0; + d->arch.paging.log_dirty.dirty_count = 0; + } + } + else + { + d->arch.paging.preempt.dom = current->domain; + d->arch.paging.preempt.op = sc->op; + d->arch.paging.preempt.log_dirty.done = pages; + } paging_unlock(d); + if ( rv ) + { + /* Never leave the domain paused on real errors. */ + ASSERT(rv == -EAGAIN); + return rv; + } + + if ( pages < sc->pages ) + sc->pages = pages; if ( clean ) { /* We need to further call clean_dirty_bitmap() functions of specific @@ -432,6 +544,7 @@ int paging_log_dirty_op(struct domain *d, struct xen_domctl_shadow_op *sc) return rv; out: + d->arch.paging.preempt.dom = NULL; paging_unlock(d); domain_unpause(d); @@ -498,12 +611,6 @@ void paging_log_dirty_init(struct domain *d, d->arch.paging.log_dirty.clean_dirty_bitmap = clean_dirty_bitmap; } -/* This function fress log dirty bitmap resources. */ -static void paging_log_dirty_teardown(struct domain*d) -{ - paging_free_log_dirty_bitmap(d); -} - /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -545,7 +652,7 @@ void paging_vcpu_init(struct vcpu *v) int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, - XEN_GUEST_HANDLE(void) u_domctl) + XEN_GUEST_HANDLE(void) u_domctl, bool_t resuming) { int rc; @@ -569,6 +676,21 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return -EINVAL; } + if ( resuming + ? (d->arch.paging.preempt.dom != current->domain || + d->arch.paging.preempt.op != sc->op) + : (d->arch.paging.preempt.dom && + sc->op != XEN_DOMCTL_SHADOW_OP_GET_ALLOCATION) ) + { + printk(XENLOG_G_DEBUG + "d%d:v%d: Paging op %#x on Dom%u with unfinished prior op %#x by Dom%u\n", + current->domain->domain_id, current->vcpu_id, + sc->op, d->domain_id, d->arch.paging.preempt.op, + d->arch.paging.preempt.dom + ? d->arch.paging.preempt.dom->domain_id : DOMID_INVALID); + return -EBUSY; + } + rc = xsm_shadow_control(d, sc->op); if ( rc ) return rc; @@ -593,14 +715,13 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return paging_log_dirty_enable(d); case XEN_DOMCTL_SHADOW_OP_OFF: - if ( paging_mode_log_dirty(d) ) - if ( (rc = paging_log_dirty_disable(d)) != 0 ) - return rc; + if ( (rc = paging_log_dirty_disable(d, resuming)) != 0 ) + return rc; break; case XEN_DOMCTL_SHADOW_OP_CLEAN: case XEN_DOMCTL_SHADOW_OP_PEEK: - return paging_log_dirty_op(d, sc); + return paging_log_dirty_op(d, sc, resuming); } /* Here, dispatch domctl to the appropriate paging code */ @@ -610,19 +731,67 @@ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, return shadow_domctl(d, sc, u_domctl); } +long paging_domctl_continuation(XEN_GUEST_HANDLE(xen_domctl_t) u_domctl) +{ + struct xen_domctl op; + struct domain *d; + int ret; + + if ( copy_from_guest(&op, u_domctl, 1) ) + return -EFAULT; + + if ( op.interface_version != XEN_DOMCTL_INTERFACE_VERSION || + op.cmd != XEN_DOMCTL_shadow_op ) + return -EBADRQC; + + d = rcu_lock_domain_by_id(op.domain); + if ( d == NULL ) + return -ESRCH; + + ret = xsm_domctl(d, op.cmd); + if ( !ret ) + { + if ( domctl_lock_acquire() ) + { + ret = paging_domctl(d, &op.u.shadow_op, + guest_handle_cast(u_domctl, void), 1); + + domctl_lock_release(); + } + else + ret = -EAGAIN; + } + + rcu_unlock_domain(d); + + if ( ret == -EAGAIN ) + ret = hypercall_create_continuation(__HYPERVISOR_arch_1, + "h", u_domctl); + else if ( __copy_field_to_guest(u_domctl, &op, u.shadow_op) ) + ret = -EFAULT; + + return ret; +} + /* Call when destroying a domain */ -void paging_teardown(struct domain *d) +int paging_teardown(struct domain *d) { + int rc; + if ( hap_enabled(d) ) hap_teardown(d); else shadow_teardown(d); /* clean up log dirty resources. */ - paging_log_dirty_teardown(d); + rc = paging_free_log_dirty_bitmap(d, 0); + if ( rc == -EAGAIN ) + return rc; /* Move populate-on-demand cache back to domain_list for destruction */ p2m_pod_empty_cache(d); + + return rc; } /* Call once all of the references to the domain have gone away */ diff --git a/xen/arch/x86/x86_32/entry.S b/xen/arch/x86/x86_32/entry.S index b460966..e92eec2 100644 --- a/xen/arch/x86/x86_32/entry.S +++ b/xen/arch/x86/x86_32/entry.S @@ -728,6 +728,7 @@ ENTRY(hypercall_table) .long do_ni_hypercall .endr .long do_mca /* 48 */ + .long paging_domctl_continuation .rept NR_hypercalls-((.-hypercall_table)/4) .long do_ni_hypercall .endr @@ -776,6 +777,7 @@ ENTRY(hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr .byte 1 /* do_mca */ /* 48 */ + .byte 1 /* paging_domctl_continuation */ .rept NR_hypercalls-(.-hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 4482f6e..4e1e90e 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -418,6 +418,7 @@ ENTRY(compat_hypercall_table) .quad compat_ni_hypercall .endr .quad do_mca /* 48 */ + .quad paging_domctl_continuation .rept NR_hypercalls-((.-compat_hypercall_table)/8) .quad compat_ni_hypercall .endr @@ -466,6 +467,7 @@ ENTRY(compat_hypercall_args_table) .byte 0 /* compat_ni_hypercall */ .endr .byte 1 /* do_mca */ + .byte 1 /* paging_domctl_continuation */ .rept NR_hypercalls-(.-compat_hypercall_args_table) .byte 0 /* compat_ni_hypercall */ .endr diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 85e9a17..b8e8959 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -749,6 +749,7 @@ ENTRY(hypercall_table) .quad do_ni_hypercall .endr .quad do_mca /* 48 */ + .quad paging_domctl_continuation .rept NR_hypercalls-((.-hypercall_table)/8) .quad do_ni_hypercall .endr @@ -797,6 +798,7 @@ ENTRY(hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr .byte 1 /* do_mca */ /* 48 */ + .byte 1 /* paging_domctl_continuation */ .rept NR_hypercalls-(.-hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr diff --git a/xen/common/domain.c b/xen/common/domain.c index 73842f9..45d90bf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -479,7 +479,6 @@ int domain_kill(struct domain *d) rc = domain_relinquish_resources(d); if ( rc != 0 ) { - BUG_ON(rc != -EAGAIN); break; } if ( sched_move_domain(d, cpupool0) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 6c62c25..5c8232d 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -193,6 +193,20 @@ struct paging_domain { struct hap_domain hap; /* log dirty support */ struct log_dirty_domain log_dirty; + + /* preemption handling */ + struct { + const struct domain *dom; + unsigned int op; + union { + struct { + unsigned long done:PADDR_BITS - PAGE_SHIFT; + unsigned long i4:PAGETABLE_ORDER; + unsigned long i3:PAGETABLE_ORDER; + } log_dirty; + }; + } preempt; + /* alloc/free pages from the pool for paging-assistance structures * (used by p2m and log-dirty code for their tries) */ struct page_info * (*alloc_page)(struct domain *d); diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index 1e77e78..a8a95f7 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -141,9 +141,6 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ -/* free log dirty bitmap resource */ -void paging_free_log_dirty_bitmap(struct domain *d); - /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -153,9 +150,6 @@ void paging_log_dirty_range(struct domain *d, /* enable log dirty */ int paging_log_dirty_enable(struct domain *d); -/* disable log dirty */ -int paging_log_dirty_disable(struct domain *d); - /* log dirty initialization */ void paging_log_dirty_init(struct domain *d, int (*enable_log_dirty)(struct domain *d), @@ -215,10 +209,13 @@ int paging_domain_init(struct domain *d, unsigned int domcr_flags); * and disable ephemeral shadow modes (test mode and log-dirty mode) and * manipulate the log-dirty bitmap. */ int paging_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, - XEN_GUEST_HANDLE(void) u_domctl); + XEN_GUEST_HANDLE(void) u_domctl, bool_t resuming); + +/* Helper hypercall for dealing with continuations. */ +long paging_domctl_continuation(XEN_GUEST_HANDLE(xen_domctl_t)); /* Call when destroying a domain */ -void paging_teardown(struct domain *d); +int paging_teardown(struct domain *d); /* Call once all of the references to the domain have gone away */ void paging_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Nov 18 05:00:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Nov 2014 05:00:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xqats-0000KQ-1o; Tue, 18 Nov 2014 05:00:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xqatq-0000KD-CZ for xen-changelog@lists.xensource.com; Tue, 18 Nov 2014 05:00:22 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 2E/17-09284-562DA645; Tue, 18 Nov 2014 05:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1416286819!9595916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24520 invoked from network); 18 Nov 2014 05:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2014 05:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xqati-0003kj-K9 for xen-changelog@lists.xensource.com; Tue, 18 Nov 2014 05:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqatY-0003bC-4O for xen-changelog@lists.xensource.com; Tue, 18 Nov 2014 05:00:04 +0000 Date: Tue, 18 Nov 2014 05:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: piix4_pm: init legacy PCI hotplug when running on 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 0c94ca5ffeb6d314404ecbc231bef28fe8d3fc51 Author: Igor Mammedov AuthorDate: Fri Nov 14 11:11:44 2014 +0000 Commit: Stefano Stabellini CommitDate: Mon Nov 17 11:19:34 2014 +0000 pc: piix4_pm: init legacy PCI hotplug when running on Xen If user starts QEMU with "-machine pc,accel=xen", then compat property in xenfv won't work and it would cause error: "Unsupported bus. Bus doesn't have property 'acpi-pcihp-bsel' set" when PCI device is added with -device on QEMU CLI. From: Igor Mammedov In case of Xen instead of using compat property, just use the fact that xen doesn't use QEMU's fw_cfg/acpi tables to switch piix4_pm into legacy PCI hotplug mode when Xen is enabled. upstream-commit-id: 91ab2ed7221c70ed7fd09ab2665b1f0493c775a4 Signed-off-by: Igor Mammedov Signed-off-by: Li Liang Signed-off-by: Stefano Stabellini Acked-by: Paolo Bonzini Tested-by: Li Liang Conflicts: hw/acpi/piix4.c --- hw/acpi/piix4.c | 4 ++++ hw/i386/pc_piix.c | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 67dc075..709b312 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -33,6 +33,7 @@ #include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/hotplug.h" +#include "hw/xen/xen.h" //#define DEBUG @@ -453,6 +454,9 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, s->irq = sci_irq; s->smi_irq = smi_irq; s->kvm_enabled = kvm_enabled; + if (xen_enabled()) { + s->use_acpi_pci_hotplug = false; + } qdev_init_nofail(dev); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ce708c7..4cbd993 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -837,17 +837,6 @@ static QEMUMachine xenfv_machine = { .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", .hot_add_cpu = pc_hot_add_cpu, - .compat_props = (GlobalProperty[]) { - /* xenfv has no fwcfg and so does not load acpi from QEMU. - * as such new acpi features don't work. - */ - { - .driver = "PIIX4_PM", - .property = "acpi-pci-hotplug-with-bridge-support", - .value = "off", - }, - { /* end of list */ } - }, }; #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 Tue Nov 18 05:00:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 18 Nov 2014 05:00:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xqats-0000KQ-1o; Tue, 18 Nov 2014 05:00:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xqatq-0000KD-CZ for xen-changelog@lists.xensource.com; Tue, 18 Nov 2014 05:00:22 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 2E/17-09284-562DA645; Tue, 18 Nov 2014 05:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1416286819!9595916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24520 invoked from network); 18 Nov 2014 05:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Nov 2014 05:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xqati-0003kj-K9 for xen-changelog@lists.xensource.com; Tue, 18 Nov 2014 05:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqatY-0003bC-4O for xen-changelog@lists.xensource.com; Tue, 18 Nov 2014 05:00:04 +0000 Date: Tue, 18 Nov 2014 05:00:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] pc: piix4_pm: init legacy PCI hotplug when running on 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 0c94ca5ffeb6d314404ecbc231bef28fe8d3fc51 Author: Igor Mammedov AuthorDate: Fri Nov 14 11:11:44 2014 +0000 Commit: Stefano Stabellini CommitDate: Mon Nov 17 11:19:34 2014 +0000 pc: piix4_pm: init legacy PCI hotplug when running on Xen If user starts QEMU with "-machine pc,accel=xen", then compat property in xenfv won't work and it would cause error: "Unsupported bus. Bus doesn't have property 'acpi-pcihp-bsel' set" when PCI device is added with -device on QEMU CLI. From: Igor Mammedov In case of Xen instead of using compat property, just use the fact that xen doesn't use QEMU's fw_cfg/acpi tables to switch piix4_pm into legacy PCI hotplug mode when Xen is enabled. upstream-commit-id: 91ab2ed7221c70ed7fd09ab2665b1f0493c775a4 Signed-off-by: Igor Mammedov Signed-off-by: Li Liang Signed-off-by: Stefano Stabellini Acked-by: Paolo Bonzini Tested-by: Li Liang Conflicts: hw/acpi/piix4.c --- hw/acpi/piix4.c | 4 ++++ hw/i386/pc_piix.c | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 67dc075..709b312 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -33,6 +33,7 @@ #include "hw/acpi/pcihp.h" #include "hw/acpi/cpu_hotplug.h" #include "hw/hotplug.h" +#include "hw/xen/xen.h" //#define DEBUG @@ -453,6 +454,9 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, s->irq = sci_irq; s->smi_irq = smi_irq; s->kvm_enabled = kvm_enabled; + if (xen_enabled()) { + s->use_acpi_pci_hotplug = false; + } qdev_init_nofail(dev); diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ce708c7..4cbd993 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -837,17 +837,6 @@ static QEMUMachine xenfv_machine = { .max_cpus = HVM_MAX_VCPUS, .default_machine_opts = "accel=xen", .hot_add_cpu = pc_hot_add_cpu, - .compat_props = (GlobalProperty[]) { - /* xenfv has no fwcfg and so does not load acpi from QEMU. - * as such new acpi features don't work. - */ - { - .driver = "PIIX4_PM", - .property = "acpi-pci-hotplug-with-bridge-support", - .value = "off", - }, - { /* end of list */ } - }, }; #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 Wed Nov 19 04:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIN-0001Ew-Qb; Wed, 19 Nov 2014 04:55:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIM-0001Eq-Rd for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:11 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 43/70-09842-EA22C645; Wed, 19 Nov 2014 04:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1416372906!13742280!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29103 invoked from network); 19 Nov 2014 04:55:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIG-0001rx-NR for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIF-0007O0-Px for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:03 +0000 Date: Wed, 19 Nov 2014 04:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Xen 4.5.0-rc2: Update tag for QEMU upstream 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 cacfcc5b4bfd705e48cdf19473e6be612d3e82c5 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Nov 11 09:40:20 2014 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 11 09:40:20 2014 -0500 Xen 4.5.0-rc2: Update tag for QEMU upstream tree.... QEMU traditional can stay at rc1 since there are no changes in it. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index a5b6c41..642744f 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc2 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.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 19 04:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIN-0001Ew-Qb; Wed, 19 Nov 2014 04:55:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIM-0001Eq-Rd for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:11 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 43/70-09842-EA22C645; Wed, 19 Nov 2014 04:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1416372906!13742280!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29103 invoked from network); 19 Nov 2014 04:55:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:55:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIG-0001rx-NR for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIF-0007O0-Px for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:03 +0000 Date: Wed, 19 Nov 2014 04:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Xen 4.5.0-rc2: Update tag for QEMU upstream 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 cacfcc5b4bfd705e48cdf19473e6be612d3e82c5 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Nov 11 09:40:20 2014 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Nov 11 09:40:20 2014 -0500 Xen 4.5.0-rc2: Update tag for QEMU upstream tree.... QEMU traditional can stay at rc1 since there are no changes in it. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index a5b6c41..642744f 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc2 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.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 19 04:55:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxIa-0001Gi-Vs; Wed, 19 Nov 2014 04:55:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIZ-0001GP-Su for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:23 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 74/90-09842-BB22C645; Wed, 19 Nov 2014 04:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1416372922!13421840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5526 invoked from network); 19 Nov 2014 04:55:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIX-0001s3-GN for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIS-0007OY-6U for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:16 +0000 Date: Wed, 19 Nov 2014 04:55:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix commit xen/arm: Add support for GICv3 for domU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 608aae36bba86cd2f3656910f3f3b079e53b9aa2 Author: M A Young AuthorDate: Tue Nov 11 20:28:38 2014 +0000 Commit: Ian Campbell CommitDate: Wed Nov 12 10:39:56 2014 +0000 fix commit xen/arm: Add support for GICv3 for domU The build of xen-4.5.0-rc2 fails if XSM_ENABLE=y due to an inconsistency in commit fda1614 "xen/arm: Add support for GICv3 for domU" which uses XEN_DOMCTL_configure_domain in xen/xsm/flask/hooks.c and xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain elsewhere. Michael Young In fda1614 ("xen/arm: Add support for GICv3 for domU") XEN_DOMCTL_configure_domain is used in xen/xsm/flask/hooks.c and xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain is used elsewhere. Signed-off-by: Michael Young Acked-by: Ian Campbell --- xen/xsm/flask/hooks.c | 2 +- xen/xsm/flask/policy/access_vectors | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 846cf88..0ba2ce9 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -727,7 +727,7 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cmt_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP); - case XEN_DOMCTL_configure_domain: + case XEN_DOMCTL_arm_configure_domain: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CONFIGURE_DOMAIN); default: diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index bfe2fa5..1cd451e 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -102,7 +102,7 @@ class domain unpause # XEN_DOMCTL_resumedomain resume -# XEN_DOMCTL_createdomain +# XEN_DOMCTL_arm_createdomain create # checked in FLASK_RELABEL_DOMAIN for any relabel operation: # source = the old label of the 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 Wed Nov 19 04:55:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxIa-0001Gi-Vs; Wed, 19 Nov 2014 04:55:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIZ-0001GP-Su for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:23 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 74/90-09842-BB22C645; Wed, 19 Nov 2014 04:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1416372922!13421840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5526 invoked from network); 19 Nov 2014 04:55:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:55:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIX-0001s3-GN for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIS-0007OY-6U for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:16 +0000 Date: Wed, 19 Nov 2014 04:55:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix commit xen/arm: Add support for GICv3 for domU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 608aae36bba86cd2f3656910f3f3b079e53b9aa2 Author: M A Young AuthorDate: Tue Nov 11 20:28:38 2014 +0000 Commit: Ian Campbell CommitDate: Wed Nov 12 10:39:56 2014 +0000 fix commit xen/arm: Add support for GICv3 for domU The build of xen-4.5.0-rc2 fails if XSM_ENABLE=y due to an inconsistency in commit fda1614 "xen/arm: Add support for GICv3 for domU" which uses XEN_DOMCTL_configure_domain in xen/xsm/flask/hooks.c and xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain elsewhere. Michael Young In fda1614 ("xen/arm: Add support for GICv3 for domU") XEN_DOMCTL_configure_domain is used in xen/xsm/flask/hooks.c and xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain is used elsewhere. Signed-off-by: Michael Young Acked-by: Ian Campbell --- xen/xsm/flask/hooks.c | 2 +- xen/xsm/flask/policy/access_vectors | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 846cf88..0ba2ce9 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -727,7 +727,7 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cmt_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP); - case XEN_DOMCTL_configure_domain: + case XEN_DOMCTL_arm_configure_domain: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CONFIGURE_DOMAIN); default: diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index bfe2fa5..1cd451e 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -102,7 +102,7 @@ class domain unpause # XEN_DOMCTL_resumedomain resume -# XEN_DOMCTL_createdomain +# XEN_DOMCTL_arm_createdomain create # checked in FLASK_RELABEL_DOMAIN for any relabel operation: # source = the old label of the 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 Wed Nov 19 04:55:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxIl-0001IQ-2Q; Wed, 19 Nov 2014 04:55:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIk-0001IG-Dr for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:34 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 28/EF-27623-5C22C645; Wed, 19 Nov 2014 04:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1416372932!12189168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9541 invoked from network); 19 Nov 2014 04:55:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:55:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIh-0001sB-VF for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIh-0007PY-KX for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:31 +0000 Date: Wed, 19 Nov 2014 04:55:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: sanity check input and serialization X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f9ccbbacc0cdda1dd41c2e36b3fb622e434dc13 Author: Meng Xu AuthorDate: Wed Nov 12 12:34:49 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:34:49 2014 +0100 sched_rt: sanity check input and serialization Sanity check input params in rt_dom_cntl(); Serialize rt_dom_cntl() against the global lock. Reported-by: Jan Beulich Signed-off-by: Meng Xu Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap Release-Acked-by: Konrad Rzeszutek Wilk --- xen/common/sched_rt.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 6c8faeb..8251e41 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -1042,25 +1042,36 @@ rt_dom_cntl( struct domain *d, struct xen_domctl_scheduler_op *op) { + struct rt_private *prv = rt_priv(ops); struct rt_dom * const sdom = rt_dom(d); struct rt_vcpu *svc; struct list_head *iter; + unsigned long flags; int rc = 0; switch ( op->cmd ) { case XEN_DOMCTL_SCHEDOP_getinfo: + spin_lock_irqsave(&prv->lock, flags); svc = list_entry(sdom->vcpu.next, struct rt_vcpu, sdom_elem); op->u.rtds.period = svc->period / MICROSECS(1); /* transfer to us */ op->u.rtds.budget = svc->budget / MICROSECS(1); + spin_unlock_irqrestore(&prv->lock, flags); break; case XEN_DOMCTL_SCHEDOP_putinfo: + if ( op->u.rtds.period == 0 || op->u.rtds.budget == 0 ) + { + rc = -EINVAL; + break; + } + spin_lock_irqsave(&prv->lock, flags); list_for_each( iter, &sdom->vcpu ) { struct rt_vcpu * svc = list_entry(iter, struct rt_vcpu, sdom_elem); svc->period = MICROSECS(op->u.rtds.period); /* transfer to nanosec */ svc->budget = MICROSECS(op->u.rtds.budget); } + spin_unlock_irqrestore(&prv->lock, flags); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 04:55:35 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxIl-0001IQ-2Q; Wed, 19 Nov 2014 04:55:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIk-0001IG-Dr for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:34 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 28/EF-27623-5C22C645; Wed, 19 Nov 2014 04:55:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1416372932!12189168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9541 invoked from network); 19 Nov 2014 04:55:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:55:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIh-0001sB-VF for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIh-0007PY-KX for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:31 +0000 Date: Wed, 19 Nov 2014 04:55:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: sanity check input and serialization X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9f9ccbbacc0cdda1dd41c2e36b3fb622e434dc13 Author: Meng Xu AuthorDate: Wed Nov 12 12:34:49 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:34:49 2014 +0100 sched_rt: sanity check input and serialization Sanity check input params in rt_dom_cntl(); Serialize rt_dom_cntl() against the global lock. Reported-by: Jan Beulich Signed-off-by: Meng Xu Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap Release-Acked-by: Konrad Rzeszutek Wilk --- xen/common/sched_rt.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 6c8faeb..8251e41 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -1042,25 +1042,36 @@ rt_dom_cntl( struct domain *d, struct xen_domctl_scheduler_op *op) { + struct rt_private *prv = rt_priv(ops); struct rt_dom * const sdom = rt_dom(d); struct rt_vcpu *svc; struct list_head *iter; + unsigned long flags; int rc = 0; switch ( op->cmd ) { case XEN_DOMCTL_SCHEDOP_getinfo: + spin_lock_irqsave(&prv->lock, flags); svc = list_entry(sdom->vcpu.next, struct rt_vcpu, sdom_elem); op->u.rtds.period = svc->period / MICROSECS(1); /* transfer to us */ op->u.rtds.budget = svc->budget / MICROSECS(1); + spin_unlock_irqrestore(&prv->lock, flags); break; case XEN_DOMCTL_SCHEDOP_putinfo: + if ( op->u.rtds.period == 0 || op->u.rtds.budget == 0 ) + { + rc = -EINVAL; + break; + } + spin_lock_irqsave(&prv->lock, flags); list_for_each( iter, &sdom->vcpu ) { struct rt_vcpu * svc = list_entry(iter, struct rt_vcpu, sdom_elem); svc->period = MICROSECS(op->u.rtds.period); /* transfer to nanosec */ svc->budget = MICROSECS(op->u.rtds.budget); } + spin_unlock_irqrestore(&prv->lock, flags); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 04:55:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:55: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 1XqxIv-0001KB-5S; Wed, 19 Nov 2014 04:55:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIu-0001Jv-AM for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:44 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 67/54-09936-FC22C645; Wed, 19 Nov 2014 04:55:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1416372942!13764328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3093 invoked from network); 19 Nov 2014 04:55:43 -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; 19 Nov 2014 04:55:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIs-0001sH-4g for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIs-0007Q0-3H for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:42 +0000 Date: Wed, 19 Nov 2014 04:55:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: serialize vcpu data access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 802b778e9aad55ebc202f581046ad978b8620c2e Author: Meng Xu AuthorDate: Wed Nov 12 12:36:04 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:36:04 2014 +0100 sched_rt: serialize vcpu data access Fix the following two issues in rtds scheduler: 1) The runq queue lock is not grabbed when rt_update_deadline is called in rt_alloc_vdata function, which may cause race condition; Solution: Move call to rt_update_deadline from _alloc to _insert; Note: rt_alloc_vdata does not need grab the runq lock, because only one cpu will allocate the rt_vcpu; before the rt_vcpu is inserted into the runq, no more than one cpu operates on the rt_vcpu. 2) rt_vcpu_remove should grab the runq lock before remove the vcpu from runq; otherwise, race condition may happen. Solution: Add lock in rt_vcpu_remove(). Reported-by: Jan Beulich Signed-off-by: Meng Xu Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap Release-Acked-by: Konrad Rzeszutek Wilk --- xen/common/sched_rt.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 8251e41..e70d6c7 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -508,7 +508,6 @@ static void * rt_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) { struct rt_vcpu *svc; - s_time_t now = NOW(); /* Allocate per-VCPU info */ svc = xzalloc(struct rt_vcpu); @@ -526,10 +525,6 @@ rt_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) if ( !is_idle_vcpu(vc) ) svc->budget = RTDS_DEFAULT_BUDGET; - ASSERT( now >= svc->cur_deadline ); - - rt_update_deadline(now, svc); - return svc; } @@ -552,11 +547,15 @@ static void rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct rt_vcpu *svc = rt_vcpu(vc); + s_time_t now = NOW(); /* not addlocate idle vcpu to dom vcpu list */ if ( is_idle_vcpu(vc) ) return; + if ( now >= svc->cur_deadline ) + rt_update_deadline(now, svc); + if ( !__vcpu_on_q(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(ops, svc); @@ -573,11 +572,14 @@ rt_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) { struct rt_vcpu * const svc = rt_vcpu(vc); struct rt_dom * const sdom = svc->sdom; + spinlock_t *lock; BUG_ON( sdom == NULL ); + lock = vcpu_schedule_lock_irq(vc); if ( __vcpu_on_q(svc) ) __q_remove(svc); + vcpu_schedule_unlock_irq(lock, vc); if ( !is_idle_vcpu(vc) ) list_del_init(&svc->sdom_elem); -- generated by git-patchbot for /home/xen/git/xen.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 19 04:55:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:55: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 1XqxIv-0001KB-5S; Wed, 19 Nov 2014 04:55:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIu-0001Jv-AM for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:44 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 67/54-09936-FC22C645; Wed, 19 Nov 2014 04:55:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1416372942!13764328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3093 invoked from network); 19 Nov 2014 04:55:43 -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; 19 Nov 2014 04:55:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxIs-0001sH-4g for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxIs-0007Q0-3H for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:42 +0000 Date: Wed, 19 Nov 2014 04:55:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched_rt: serialize vcpu data access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 802b778e9aad55ebc202f581046ad978b8620c2e Author: Meng Xu AuthorDate: Wed Nov 12 12:36:04 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:36:04 2014 +0100 sched_rt: serialize vcpu data access Fix the following two issues in rtds scheduler: 1) The runq queue lock is not grabbed when rt_update_deadline is called in rt_alloc_vdata function, which may cause race condition; Solution: Move call to rt_update_deadline from _alloc to _insert; Note: rt_alloc_vdata does not need grab the runq lock, because only one cpu will allocate the rt_vcpu; before the rt_vcpu is inserted into the runq, no more than one cpu operates on the rt_vcpu. 2) rt_vcpu_remove should grab the runq lock before remove the vcpu from runq; otherwise, race condition may happen. Solution: Add lock in rt_vcpu_remove(). Reported-by: Jan Beulich Signed-off-by: Meng Xu Reviewed-by: Dario Faggioli Reviewed-by: George Dunlap Release-Acked-by: Konrad Rzeszutek Wilk --- xen/common/sched_rt.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 8251e41..e70d6c7 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -508,7 +508,6 @@ static void * rt_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) { struct rt_vcpu *svc; - s_time_t now = NOW(); /* Allocate per-VCPU info */ svc = xzalloc(struct rt_vcpu); @@ -526,10 +525,6 @@ rt_alloc_vdata(const struct scheduler *ops, struct vcpu *vc, void *dd) if ( !is_idle_vcpu(vc) ) svc->budget = RTDS_DEFAULT_BUDGET; - ASSERT( now >= svc->cur_deadline ); - - rt_update_deadline(now, svc); - return svc; } @@ -552,11 +547,15 @@ static void rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct rt_vcpu *svc = rt_vcpu(vc); + s_time_t now = NOW(); /* not addlocate idle vcpu to dom vcpu list */ if ( is_idle_vcpu(vc) ) return; + if ( now >= svc->cur_deadline ) + rt_update_deadline(now, svc); + if ( !__vcpu_on_q(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(ops, svc); @@ -573,11 +572,14 @@ rt_vcpu_remove(const struct scheduler *ops, struct vcpu *vc) { struct rt_vcpu * const svc = rt_vcpu(vc); struct rt_dom * const sdom = svc->sdom; + spinlock_t *lock; BUG_ON( sdom == NULL ); + lock = vcpu_schedule_lock_irq(vc); if ( __vcpu_on_q(svc) ) __q_remove(svc); + vcpu_schedule_unlock_irq(lock, vc); if ( !is_idle_vcpu(vc) ) list_del_init(&svc->sdom_elem); -- generated by git-patchbot for /home/xen/git/xen.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 19 04:55:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJ6-0001N8-9w; Wed, 19 Nov 2014 04:55:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJ5-0001Mi-GW for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:55 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 62/C4-24124-AD22C645; Wed, 19 Nov 2014 04:55:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1416372952!9260626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23710 invoked from network); 19 Nov 2014 04:55:53 -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; 19 Nov 2014 04:55:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJ2-0001sT-BR for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJ2-0007QN-7r for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:52 +0000 Date: Wed, 19 Nov 2014 04:55:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci 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 aeeea485bcfe2a517ed9bcb3ba1c3be0f6824e07 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Nov 12 12:37:10 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:37:10 2014 +0100 dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci model When an interrupt for an PCI (or PCIe) passthrough device is to be sent to a guest, we find the appropiate 'hvm_dirq_dpci' structure for the interrupt (PIRQ), set a bit (masked), and schedule an tasklet. Then the 'hvm_dirq_assist' tasklet gets called with the 'struct domain' from where it iterates over the the radix-tree of 'hvm_dirq_dpci' (from zero to the number of PIRQs allocated) which are masked to the guest and calls each 'hvm_pirq_assist'. If the PIRQ has a bit set (masked) it figures out how to inject the PIRQ to the guest. This is inefficient and not fair as: - We iterate starting at PIRQ 0 and up every time. That means the PCIe devices that have lower PIRQs get to be called first. - If we have many PCIe devices passed in with many PIRQs and if most of the time only the highest numbered PIRQ get an interrupt (as the initial ones are for control) we end up iterating over many PIRQs. But we could do beter - the 'hvm_dirq_dpci' has the field for 'struct domain', which we can use instead of having to pass in the 'struct domain'. As such this patch moves the tasklet to the 'struct hvm_dirq_dpci' and sets the 'dom' field to the domain. We also double-check that the '->dom' is not reset before using it. We have to be careful with this as that means we MUST have 'dom' set before pirq_guest_bind() is called. As such we add the 'pirq_dpci->dom = d;' to cover for such cases. The mechanism to tear it down is more complex as there are two ways it can be executed: a) pci_clean_dpci_irq. This gets called when the guest is being destroyed. We end up calling 'tasklet_kill'. The scenarios in which the 'struct pirq' (and subsequently the 'hvm_pirq_dpci') gets destroyed is when: - guest did not use the pirq at all after setup. - guest did use pirq, but decided to mask and left it in that state. - guest did use pirq, but crashed. In all of those scenarios we end up calling 'tasklet_kill' which will spin on the tasklet if it is running. b) pt_irq_destroy_bind (guest disables the MSI). We double-check that the softirq has run by piggy-backing on the existing 'pirq_cleanup_check' mechanism which calls 'pt_pirq_cleanup_check'. We add the extra call to 'pt_pirq_softirq_active' in 'pt_pirq_cleanup_check'. NOTE: Guests that use event channels unbind first the event channel from PIRQs, so the 'pt_pirq_cleanup_check' won't be called as event is set to zero. In that case we either clean it up via the a) mechanism. It is OK to re-use the tasklet when 'pt_irq_create_bind' is called afterwards. There is an extra scenario regardless of event being set or not: the guest did 'pt_irq_destroy_bind' while an interrupt was triggered and tasklet was scheduled (but had not been run). It is OK to still run the tasklet as hvm_dirq_assist won't do anything (as the flags are set to zero). As such we can exit out of hvm_dirq_assist without doing anything. Suggested-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/drivers/passthrough/io.c | 75 ++++++++++++++++++++++++++++------------ xen/drivers/passthrough/pci.c | 4 +- xen/include/xen/hvm/irq.h | 2 +- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 4cd32b5..dceb17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -27,7 +27,7 @@ #include #include -static void hvm_dirq_assist(unsigned long _d); +static void hvm_dirq_assist(unsigned long arg); bool_t pt_irq_need_timer(uint32_t flags) { @@ -114,9 +114,6 @@ int pt_irq_create_bind( spin_unlock(&d->event_lock); return -ENOMEM; } - softirq_tasklet_init( - &hvm_irq_dpci->dirq_tasklet, - hvm_dirq_assist, (unsigned long)d); for ( i = 0; i < NR_HVM_IRQS; i++ ) INIT_LIST_HEAD(&hvm_irq_dpci->girq[i]); @@ -144,6 +141,18 @@ int pt_irq_create_bind( HVM_IRQ_DPCI_GUEST_MSI; pirq_dpci->gmsi.gvec = pt_irq_bind->u.msi.gvec; pirq_dpci->gmsi.gflags = pt_irq_bind->u.msi.gflags; + /* + * 'pt_irq_create_bind' can be called after 'pt_irq_destroy_bind'. + * The 'pirq_cleanup_check' which would free the structure is only + * called if the event channel for the PIRQ is active. However + * OS-es that use event channels usually bind PIRQs to eventds + * and unbind them before calling 'pt_irq_destroy_bind' - with the + * result that we re-use the 'dpci' structure. This can be + * reproduced with unloading and loading the driver for a device. + * + * As such on every 'pt_irq_create_bind' call we MUST set it. + */ + pirq_dpci->dom = d; /* bind after hvm_irq_dpci is setup to avoid race with irq handler*/ rc = pirq_guest_bind(d->vcpu[0], info, 0); if ( rc == 0 && pt_irq_bind->u.msi.gtable ) @@ -156,6 +165,7 @@ int pt_irq_create_bind( { pirq_dpci->gmsi.gflags = 0; pirq_dpci->gmsi.gvec = 0; + pirq_dpci->dom = NULL; pirq_dpci->flags = 0; pirq_cleanup_check(info, d); spin_unlock(&d->event_lock); @@ -232,6 +242,7 @@ int pt_irq_create_bind( { unsigned int share; + /* MUST be set, as the pirq_dpci can be re-used. */ pirq_dpci->dom = d; if ( pt_irq_bind->irq_type == PT_IRQ_TYPE_MSI_TRANSLATE ) { @@ -415,11 +426,18 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; + softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - return !dpci->flags; + if ( !dpci->flags ) + { + tasklet_kill(&dpci->tasklet); + dpci->dom = NULL; + return 1; + } + return 0; } int pt_pirq_iterate(struct domain *d, @@ -459,7 +477,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) return 0; pirq_dpci->masked = 1; - tasklet_schedule(&dpci->dirq_tasklet); + tasklet_schedule(&pirq_dpci->tasklet); return 1; } @@ -513,9 +531,27 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, - void *arg) +static void hvm_dirq_assist(unsigned long arg) { + struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; + struct domain *d = pirq_dpci->dom; + + /* + * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled + * right before 'pirq_guest_unbind' gets called - but us not yet executed. + * + * And '->dom' gets cleared later in the destroy path. We exit and clear + * 'masked' - which is OK as later in this code we would + * do nothing except clear the ->masked field anyhow. + */ + if ( !d ) + { + pirq_dpci->masked = 0; + return; + } + ASSERT(d->arch.hvm_domain.irq.dpci); + + spin_lock(&d->event_lock); if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); @@ -526,13 +562,17 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, send_guest_pirq(d, pirq); if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) - return 0; + { + spin_unlock(&d->event_lock); + return; + } } if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) { vmsi_deliver_pirq(d, pirq_dpci); - return 0; + spin_unlock(&d->event_lock); + return; } list_for_each_entry ( digl, &pirq_dpci->digl_list, list ) @@ -545,7 +585,8 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, { /* for translated MSI to INTx interrupt, eoi as early as possible */ __msi_pirq_eoi(pirq_dpci); - return 0; + spin_unlock(&d->event_lock); + return; } /* @@ -558,18 +599,6 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, ASSERT(pt_irq_need_timer(pirq_dpci->flags)); set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); } - - return 0; -} - -static void hvm_dirq_assist(unsigned long _d) -{ - struct domain *d = (struct domain *)_d; - - ASSERT(d->arch.hvm_domain.irq.dpci); - - spin_lock(&d->event_lock); - pt_pirq_iterate(d, _hvm_dirq_assist, NULL); spin_unlock(&d->event_lock); } diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 1eba833..81e8a3a 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,6 +767,8 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } + tasklet_kill(&pirq_dpci->tasklet); + return 0; } @@ -784,8 +786,6 @@ static void pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - tasklet_kill(&hvm_irq_dpci->dirq_tasklet); - pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); d->arch.hvm_domain.irq.dpci = NULL; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index c89f4b1..94a550a 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -88,7 +88,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - struct tasklet dirq_tasklet; }; /* Machine IRQ to guest device/intx mapping. */ @@ -100,6 +99,7 @@ struct hvm_pirq_dpci { struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; + struct tasklet tasklet; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); -- generated by git-patchbot for /home/xen/git/xen.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 19 04:55:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJ6-0001N8-9w; Wed, 19 Nov 2014 04:55:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJ5-0001Mi-GW for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:55 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 62/C4-24124-AD22C645; Wed, 19 Nov 2014 04:55:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1416372952!9260626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23710 invoked from network); 19 Nov 2014 04:55:53 -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; 19 Nov 2014 04:55:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJ2-0001sT-BR for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJ2-0007QN-7r for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:55:52 +0000 Date: Wed, 19 Nov 2014 04:55:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci 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 aeeea485bcfe2a517ed9bcb3ba1c3be0f6824e07 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Nov 12 12:37:10 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:37:10 2014 +0100 dpci: move from an hvm_irq_dpci (and struct domain) to an hvm_dirq_dpci model When an interrupt for an PCI (or PCIe) passthrough device is to be sent to a guest, we find the appropiate 'hvm_dirq_dpci' structure for the interrupt (PIRQ), set a bit (masked), and schedule an tasklet. Then the 'hvm_dirq_assist' tasklet gets called with the 'struct domain' from where it iterates over the the radix-tree of 'hvm_dirq_dpci' (from zero to the number of PIRQs allocated) which are masked to the guest and calls each 'hvm_pirq_assist'. If the PIRQ has a bit set (masked) it figures out how to inject the PIRQ to the guest. This is inefficient and not fair as: - We iterate starting at PIRQ 0 and up every time. That means the PCIe devices that have lower PIRQs get to be called first. - If we have many PCIe devices passed in with many PIRQs and if most of the time only the highest numbered PIRQ get an interrupt (as the initial ones are for control) we end up iterating over many PIRQs. But we could do beter - the 'hvm_dirq_dpci' has the field for 'struct domain', which we can use instead of having to pass in the 'struct domain'. As such this patch moves the tasklet to the 'struct hvm_dirq_dpci' and sets the 'dom' field to the domain. We also double-check that the '->dom' is not reset before using it. We have to be careful with this as that means we MUST have 'dom' set before pirq_guest_bind() is called. As such we add the 'pirq_dpci->dom = d;' to cover for such cases. The mechanism to tear it down is more complex as there are two ways it can be executed: a) pci_clean_dpci_irq. This gets called when the guest is being destroyed. We end up calling 'tasklet_kill'. The scenarios in which the 'struct pirq' (and subsequently the 'hvm_pirq_dpci') gets destroyed is when: - guest did not use the pirq at all after setup. - guest did use pirq, but decided to mask and left it in that state. - guest did use pirq, but crashed. In all of those scenarios we end up calling 'tasklet_kill' which will spin on the tasklet if it is running. b) pt_irq_destroy_bind (guest disables the MSI). We double-check that the softirq has run by piggy-backing on the existing 'pirq_cleanup_check' mechanism which calls 'pt_pirq_cleanup_check'. We add the extra call to 'pt_pirq_softirq_active' in 'pt_pirq_cleanup_check'. NOTE: Guests that use event channels unbind first the event channel from PIRQs, so the 'pt_pirq_cleanup_check' won't be called as event is set to zero. In that case we either clean it up via the a) mechanism. It is OK to re-use the tasklet when 'pt_irq_create_bind' is called afterwards. There is an extra scenario regardless of event being set or not: the guest did 'pt_irq_destroy_bind' while an interrupt was triggered and tasklet was scheduled (but had not been run). It is OK to still run the tasklet as hvm_dirq_assist won't do anything (as the flags are set to zero). As such we can exit out of hvm_dirq_assist without doing anything. Suggested-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/drivers/passthrough/io.c | 75 ++++++++++++++++++++++++++++------------ xen/drivers/passthrough/pci.c | 4 +- xen/include/xen/hvm/irq.h | 2 +- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index 4cd32b5..dceb17e 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -27,7 +27,7 @@ #include #include -static void hvm_dirq_assist(unsigned long _d); +static void hvm_dirq_assist(unsigned long arg); bool_t pt_irq_need_timer(uint32_t flags) { @@ -114,9 +114,6 @@ int pt_irq_create_bind( spin_unlock(&d->event_lock); return -ENOMEM; } - softirq_tasklet_init( - &hvm_irq_dpci->dirq_tasklet, - hvm_dirq_assist, (unsigned long)d); for ( i = 0; i < NR_HVM_IRQS; i++ ) INIT_LIST_HEAD(&hvm_irq_dpci->girq[i]); @@ -144,6 +141,18 @@ int pt_irq_create_bind( HVM_IRQ_DPCI_GUEST_MSI; pirq_dpci->gmsi.gvec = pt_irq_bind->u.msi.gvec; pirq_dpci->gmsi.gflags = pt_irq_bind->u.msi.gflags; + /* + * 'pt_irq_create_bind' can be called after 'pt_irq_destroy_bind'. + * The 'pirq_cleanup_check' which would free the structure is only + * called if the event channel for the PIRQ is active. However + * OS-es that use event channels usually bind PIRQs to eventds + * and unbind them before calling 'pt_irq_destroy_bind' - with the + * result that we re-use the 'dpci' structure. This can be + * reproduced with unloading and loading the driver for a device. + * + * As such on every 'pt_irq_create_bind' call we MUST set it. + */ + pirq_dpci->dom = d; /* bind after hvm_irq_dpci is setup to avoid race with irq handler*/ rc = pirq_guest_bind(d->vcpu[0], info, 0); if ( rc == 0 && pt_irq_bind->u.msi.gtable ) @@ -156,6 +165,7 @@ int pt_irq_create_bind( { pirq_dpci->gmsi.gflags = 0; pirq_dpci->gmsi.gvec = 0; + pirq_dpci->dom = NULL; pirq_dpci->flags = 0; pirq_cleanup_check(info, d); spin_unlock(&d->event_lock); @@ -232,6 +242,7 @@ int pt_irq_create_bind( { unsigned int share; + /* MUST be set, as the pirq_dpci can be re-used. */ pirq_dpci->dom = d; if ( pt_irq_bind->irq_type == PT_IRQ_TYPE_MSI_TRANSLATE ) { @@ -415,11 +426,18 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; + softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - return !dpci->flags; + if ( !dpci->flags ) + { + tasklet_kill(&dpci->tasklet); + dpci->dom = NULL; + return 1; + } + return 0; } int pt_pirq_iterate(struct domain *d, @@ -459,7 +477,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) return 0; pirq_dpci->masked = 1; - tasklet_schedule(&dpci->dirq_tasklet); + tasklet_schedule(&pirq_dpci->tasklet); return 1; } @@ -513,9 +531,27 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, - void *arg) +static void hvm_dirq_assist(unsigned long arg) { + struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; + struct domain *d = pirq_dpci->dom; + + /* + * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled + * right before 'pirq_guest_unbind' gets called - but us not yet executed. + * + * And '->dom' gets cleared later in the destroy path. We exit and clear + * 'masked' - which is OK as later in this code we would + * do nothing except clear the ->masked field anyhow. + */ + if ( !d ) + { + pirq_dpci->masked = 0; + return; + } + ASSERT(d->arch.hvm_domain.irq.dpci); + + spin_lock(&d->event_lock); if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); @@ -526,13 +562,17 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, send_guest_pirq(d, pirq); if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) - return 0; + { + spin_unlock(&d->event_lock); + return; + } } if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) { vmsi_deliver_pirq(d, pirq_dpci); - return 0; + spin_unlock(&d->event_lock); + return; } list_for_each_entry ( digl, &pirq_dpci->digl_list, list ) @@ -545,7 +585,8 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, { /* for translated MSI to INTx interrupt, eoi as early as possible */ __msi_pirq_eoi(pirq_dpci); - return 0; + spin_unlock(&d->event_lock); + return; } /* @@ -558,18 +599,6 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, ASSERT(pt_irq_need_timer(pirq_dpci->flags)); set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); } - - return 0; -} - -static void hvm_dirq_assist(unsigned long _d) -{ - struct domain *d = (struct domain *)_d; - - ASSERT(d->arch.hvm_domain.irq.dpci); - - spin_lock(&d->event_lock); - pt_pirq_iterate(d, _hvm_dirq_assist, NULL); spin_unlock(&d->event_lock); } diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 1eba833..81e8a3a 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,6 +767,8 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } + tasklet_kill(&pirq_dpci->tasklet); + return 0; } @@ -784,8 +786,6 @@ static void pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - tasklet_kill(&hvm_irq_dpci->dirq_tasklet); - pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); d->arch.hvm_domain.irq.dpci = NULL; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index c89f4b1..94a550a 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -88,7 +88,6 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; - struct tasklet dirq_tasklet; }; /* Machine IRQ to guest device/intx mapping. */ @@ -100,6 +99,7 @@ struct hvm_pirq_dpci { struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; + struct tasklet tasklet; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); -- generated by git-patchbot for /home/xen/git/xen.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 19 04:56:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxJH-0001PG-D9; Wed, 19 Nov 2014 04:56:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJF-0001Oq-PX for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:06 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 56/94-09936-5E22C645; Wed, 19 Nov 2014 04:56:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1416372962!13421905!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7200 invoked from network); 19 Nov 2014 04:56:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJC-0001t2-Gk for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJC-0007Qt-FS for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:02 +0000 Date: Wed, 19 Nov 2014 04:56:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dpci: replace tasklet with softirq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6dd295381f4b6a66acddacf46bca8940586c8d8 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Nov 12 12:38:08 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:38:08 2014 +0100 dpci: replace tasklet with softirq The existing tasklet mechanism has a single global spinlock that is taken every-time the global list is touched. And we use this lock quite a lot - when we call do_tasklet_work which is called via an softirq and from the idle loop. We take the lock on any operation on the tasklet_list. The problem we are facing is that there are quite a lot of tasklets scheduled. The most common one that is invoked is the one injecting the VIRQ_TIMER in the guest. Guests are not insane and don't set the one-shot or periodic clocks to be in sub 1ms intervals (causing said tasklet to be scheduled for such small intervalls). The problem appears when PCI passthrough devices are used over many sockets and we have an mix of heavy-interrupt guests and idle guests. The idle guests end up seeing 1/10 of its RUNNING timeslice eaten by the hypervisor (and 40% steal time). The mechanism by which we inject PCI interrupts is by hvm_do_IRQ_dpci which schedules the hvm_dirq_assist tasklet every time an interrupt is received. The callchain is: _asm_vmexit_handler -> vmx_vmexit_handler ->vmx_do_extint -> do_IRQ -> __do_IRQ_guest -> hvm_do_IRQ_dpci tasklet_schedule(&dpci->dirq_tasklet); [takes lock to put the tasklet on] [later on the schedule_tail is invoked which is 'vmx_do_resume'] vmx_do_resume -> vmx_asm_do_vmentry -> call vmx_intr_assist -> vmx_process_softirqs -> do_softirq [executes the tasklet function, takes the lock again] While on other CPUs they might be sitting in a idle loop and invoked to deliver an VIRQ_TIMER, which also ends up taking the lock twice: first to schedule the v->arch.hvm_vcpu.assert_evtchn_irq_tasklet (accounted to the guests' BLOCKED_state); then to execute it - which is accounted for in the guest's RUNTIME_state. The end result is that on a 8 socket machine with PCI passthrough, where four sockets are busy with interrupts, and the other sockets have idle guests - we end up with the idle guests having around 40% steal time and 1/10 of its timeslice (3ms out of 30 ms) being tied up taking the lock. The latency of the PCI interrupts delieved to guest is also hindered. With this patch the problem disappears completly. That is removing the lock for the PCI passthrough use-case (the 'hvm_dirq_assist' case) by not using tasklets at all. The patch is simple - instead of scheduling an tasklet we schedule our own softirq - HVM_DPCI_SOFTIRQ, which will take care of running 'hvm_dirq_assist'. The information we need on each CPU is which 'struct hvm_pirq_dpci' structure the 'hvm_dirq_assist' needs to run on. That is simple solved by threading the 'struct hvm_pirq_dpci' through a linked list. The rule of only running one 'hvm_dirq_assist' for only one 'hvm_pirq_dpci' is also preserved by having 'schedule_dpci_for' ignore any subsequent calls for an domain which has already been scheduled. == Code details == Most of the code complexity comes from the '->dom' field in the 'hvm_pirq_dpci' structure. We use it for ref-counting and as such it MUST be valid as long as STATE_SCHED bit is set. Whoever clears the STATE_SCHED bit does the ref-counting and can also reset the '->dom' field. To compound the complexity, there are multiple points where the 'hvm_pirq_dpci' structure is reset or re-used. Initially (first time the domain uses the pirq), the 'hvm_pirq_dpci->dom' field is set to NULL as it is allocated. On subsequent calls in to 'pt_irq_create_bind' the ->dom is whatever it had last time. As this is the initial call (which QEMU ends up calling when the guest writes an vector value in the MSI field) we MUST set the '->dom' to a the proper structure (otherwise we cannot do proper ref-counting). The mechanism to tear it down is more complex as there are three ways it can be executed. To make it simpler everything revolves around 'pt_pirq_softirq_active'. If it returns -EAGAIN that means there is an outstanding softirq that needs to finish running before we can continue tearing down. With that in mind: a) pci_clean_dpci_irq. This gets called when the guest is being destroyed. We end up calling 'pt_pirq_softirq_active' to see if it is OK to continue the destruction. The scenarios in which the 'struct pirq' (and subsequently the 'hvm_pirq_dpci') gets destroyed is when: - guest did not use the pirq at all after setup. - guest did use pirq, but decided to mask and left it in that state. - guest did use pirq, but crashed. In all of those scenarios we end up calling 'pt_pirq_softirq_active' to check if the softirq is still active. Read below on the 'pt_pirq_softirq_active' loop. b) pt_irq_destroy_bind (guest disables the MSI). We double-check that the softirq has run by piggy-backing on the existing 'pirq_cleanup_check' mechanism which calls 'pt_pirq_cleanup_check'. We add the extra call to 'pt_pirq_softirq_active' in 'pt_pirq_cleanup_check'. NOTE: Guests that use event channels unbind first the event channel from PIRQs, so the 'pt_pirq_cleanup_check' won't be called as 'event' is set to zero. In that case we either clean it up via the a) or c) mechanism. There is an extra scenario regardless of 'event' being set or not: the guest did 'pt_irq_destroy_bind' while an interrupt was triggered and softirq was scheduled (but had not been run). It is OK to still run the softirq as hvm_dirq_assist won't do anything (as the flags are set to zero). However we will try to deschedule the softirq if we can (by clearing the STATE_SCHED bit and us doing the ref-counting). c) pt_irq_create_bind (not a typo). The scenarios are: - guest disables the MSI and then enables it (rmmod and modprobe in a loop). We call 'pt_pirq_reset' which checks to see if the softirq has been scheduled. Imagine the 'b)' with interrupts in flight and c) getting called in a loop. We will spin up on 'pt_pirq_is_active' (at the start of the 'pt_irq_create_bind') with the event_lock spinlock dropped and waiting (cpu_relax). We cannot call 'process_pending_softirqs' as it might result in a dead-lock. hvm_dirq_assist will be executed and then the softirq will clear 'state' which signals that that we can re-use the 'hvm_pirq_dpci' structure. In case this softirq is scheduled on a remote CPU the softirq will run on it as the semantics behind an softirq is that it will execute within the guest interruption. - we hit once the error paths in 'pt_irq_create_bind' while an interrupt was triggered and softirq was scheduled. If the softirq is in STATE_RUN that means it is executing and we should let it continue on. We can clear the '->dom' field as the softirq has stashed it beforehand. If the softirq is STATE_SCHED and we are successful in clearing it, we do the ref-counting and clear the '->dom' field. Otherwise we let the softirq continue on and the '->dom' field is left intact. The clearing of the '->dom' is left to a), b) or again c) case. Note that in both cases the 'flags' variable is cleared so hvm_dirq_assist won't actually do anything. Suggested-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/drivers/passthrough/io.c | 251 ++++++++++++++++++++++++++++++++++++----- xen/drivers/passthrough/pci.c | 31 ++++-- xen/include/asm-x86/softirq.h | 3 +- xen/include/xen/hvm/irq.h | 5 +- xen/include/xen/pci.h | 2 +- 6 files changed, 255 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ae0a344..73d01bb 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1965,7 +1965,9 @@ int domain_relinquish_resources(struct domain *d) switch ( d->arch.relmem ) { case RELMEM_not_started: - pci_release_devices(d); + ret = pci_release_devices(d); + if ( ret ) + return ret; /* Tear down paging-assistance stuff. */ ret = paging_teardown(d); diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index dceb17e..efc66dc 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -20,14 +20,116 @@ #include #include +#include #include #include #include #include #include -#include -static void hvm_dirq_assist(unsigned long arg); +static DEFINE_PER_CPU(struct list_head, dpci_list); + +/* + * These two bit states help to safely schedule, deschedule, and wait until + * the softirq has finished. + * + * The semantics behind these two bits is as follow: + * - STATE_SCHED - whoever modifies it has to ref-count the domain (->dom). + * - STATE_RUN - only softirq is allowed to set and clear it. If it has + * been set hvm_dirq_assist will RUN with a saved value of the + * 'struct domain' copied from 'pirq_dpci->dom' before STATE_RUN was set. + * + * The usual states are: STATE_SCHED(set) -> STATE_RUN(set) -> + * STATE_SCHED(unset) -> STATE_RUN(unset). + * + * However the states can also diverge such as: STATE_SCHED(set) -> + * STATE_SCHED(unset) -> STATE_RUN(set) -> STATE_RUN(unset). That means + * the 'hvm_dirq_assist' never run and that the softirq did not do any + * ref-counting. + */ + +enum { + STATE_SCHED, + STATE_RUN +}; + +/* + * This can be called multiple times, but the softirq is only raised once. + * That is until the STATE_SCHED state has been cleared. The state can be + * cleared by: the 'dpci_softirq' (when it has executed 'hvm_dirq_assist'), + * or by 'pt_pirq_softirq_reset' (which will try to clear the state before + * the softirq had a chance to run). + */ +static void raise_softirq_for(struct hvm_pirq_dpci *pirq_dpci) +{ + unsigned long flags; + + if ( test_and_set_bit(STATE_SCHED, &pirq_dpci->state) ) + return; + + get_knownalive_domain(pirq_dpci->dom); + + local_irq_save(flags); + list_add_tail(&pirq_dpci->softirq_list, &this_cpu(dpci_list)); + local_irq_restore(flags); + + raise_softirq(HVM_DPCI_SOFTIRQ); +} + +/* + * If we are racing with softirq_dpci (STATE_SCHED) we return + * true. Otherwise we return false. + * + * If it is false, it is the callers responsibility to make sure + * that the softirq (with the event_lock dropped) has ran. + */ +bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *pirq_dpci) +{ + if ( pirq_dpci->state & ((1 << STATE_RUN) | (1 << STATE_SCHED)) ) + return 1; + + /* + * If in the future we would call 'raise_softirq_for' right away + * after 'pt_pirq_softirq_active' we MUST reset the list (otherwise it + * might have stale data). + */ + return 0; +} + +/* + * Reset the pirq_dpci->dom parameter to NULL. + * + * This function checks the different states to make sure it can do it + * at the right time. If it unschedules the 'hvm_dirq_assist' from running + * it also refcounts (which is what the softirq would have done) properly. + */ +static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) +{ + struct domain *d = pirq_dpci->dom; + + ASSERT(spin_is_locked(&d->event_lock)); + + switch ( cmpxchg(&pirq_dpci->state, 1 << STATE_SCHED, 0) ) + { + case (1 << STATE_SCHED): + /* + * We are going to try to de-schedule the softirq before it goes in + * STATE_RUN. Whoever clears STATE_SCHED MUST refcount the 'dom'. + */ + put_domain(d); + /* fallthrough. */ + case (1 << STATE_RUN): + case (1 << STATE_RUN) | (1 << STATE_SCHED): + /* + * The reason it is OK to reset 'dom' when STATE_RUN bit is set is due + * to a shortcut the 'dpci_softirq' implements. It stashes the 'dom' + * in local variable before it sets STATE_RUN - and therefore will not + * dereference '->dom' which would crash. + */ + pirq_dpci->dom = NULL; + break; + } +} bool_t pt_irq_need_timer(uint32_t flags) { @@ -40,7 +142,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->masked = 0; + pirq_dpci->state = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -101,6 +203,7 @@ int pt_irq_create_bind( if ( pirq < 0 || pirq >= d->nr_pirqs ) return -EINVAL; + restart: spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); @@ -128,6 +231,21 @@ int pt_irq_create_bind( } pirq_dpci = pirq_dpci(info); + /* + * A crude 'while' loop with us dropping the spinlock and giving + * the softirq_dpci a chance to run. + * We MUST check for this condition as the softirq could be scheduled + * and hasn't run yet. Note that this code replaced tasklet_kill which + * would have spun forever and would do the same thing (wait to flush out + * outstanding hvm_dirq_assist calls. + */ + if ( pt_pirq_softirq_active(pirq_dpci) ) + { + spin_unlock(&d->event_lock); + cpu_relax(); + goto restart; + } + switch ( pt_irq_bind->irq_type ) { case PT_IRQ_TYPE_MSI: @@ -159,7 +277,16 @@ int pt_irq_create_bind( { rc = msixtbl_pt_register(d, info, pt_irq_bind->u.msi.gtable); if ( unlikely(rc) ) + { pirq_guest_unbind(d, info); + /* + * Between 'pirq_guest_bind' and before 'pirq_guest_unbind' + * an interrupt can be scheduled. No more of them are going + * to be scheduled but we must deal with the one that may be + * in the queue. + */ + pt_pirq_softirq_reset(pirq_dpci); + } } if ( unlikely(rc) ) { @@ -269,6 +396,10 @@ int pt_irq_create_bind( { if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); + /* + * There is no path for __do_IRQ to schedule softirq as + * IRQ_GUEST is not set. As such we can reset 'dom' directly. + */ pirq_dpci->dom = NULL; list_del(&girq->list); list_del(&digl->list); @@ -402,8 +533,13 @@ int pt_irq_destroy_bind( msixtbl_pt_unregister(d, pirq); if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); - pirq_dpci->dom = NULL; pirq_dpci->flags = 0; + /* + * See comment in pt_irq_create_bind's PT_IRQ_TYPE_MSI before the + * call to pt_pirq_softirq_reset. + */ + pt_pirq_softirq_reset(pirq_dpci); + pirq_cleanup_check(pirq, d); } @@ -426,14 +562,12 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; - softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - if ( !dpci->flags ) + if ( !dpci->flags && !pt_pirq_softirq_active(dpci) ) { - tasklet_kill(&dpci->tasklet); dpci->dom = NULL; return 1; } @@ -476,8 +610,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; - pirq_dpci->masked = 1; - tasklet_schedule(&pirq_dpci->tasklet); + raise_softirq_for(pirq_dpci); return 1; } @@ -531,28 +664,12 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_dirq_assist(unsigned long arg) +static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) { - struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; - struct domain *d = pirq_dpci->dom; - - /* - * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled - * right before 'pirq_guest_unbind' gets called - but us not yet executed. - * - * And '->dom' gets cleared later in the destroy path. We exit and clear - * 'masked' - which is OK as later in this code we would - * do nothing except clear the ->masked field anyhow. - */ - if ( !d ) - { - pirq_dpci->masked = 0; - return; - } ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( test_and_clear_bool(pirq_dpci->masked) ) + if ( pirq_dpci->state ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; @@ -654,3 +771,83 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, unlock: spin_unlock(&d->event_lock); } + +/* + * Note: 'pt_pirq_softirq_reset' can clear the STATE_SCHED before we get to + * doing it. If that is the case we let 'pt_pirq_softirq_reset' do ref-counting. + */ +static void dpci_softirq(void) +{ + unsigned int cpu = smp_processor_id(); + LIST_HEAD(our_list); + + local_irq_disable(); + list_splice_init(&per_cpu(dpci_list, cpu), &our_list); + local_irq_enable(); + + while ( !list_empty(&our_list) ) + { + struct hvm_pirq_dpci *pirq_dpci; + struct domain *d; + + pirq_dpci = list_entry(our_list.next, struct hvm_pirq_dpci, softirq_list); + list_del(&pirq_dpci->softirq_list); + + d = pirq_dpci->dom; + smp_mb(); /* 'd' MUST be saved before we set/clear the bits. */ + if ( test_and_set_bit(STATE_RUN, &pirq_dpci->state) ) + BUG(); + /* + * The one who clears STATE_SCHED MUST refcount the domain. + */ + if ( test_and_clear_bit(STATE_SCHED, &pirq_dpci->state) ) + { + hvm_dirq_assist(d, pirq_dpci); + put_domain(d); + } + clear_bit(STATE_RUN, &pirq_dpci->state); + } +} + +static int cpu_callback( + struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + unsigned int cpu = (unsigned long)hcpu; + + switch ( action ) + { + case CPU_UP_PREPARE: + INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); + break; + case CPU_UP_CANCELED: + case CPU_DEAD: + /* + * On CPU_DYING this callback is called (on the CPU that is dying) + * with an possible HVM_DPIC_SOFTIRQ pending - at which point we can + * clear out any outstanding domains (by the virtue of the idle loop + * calling the softirq later). In CPU_DEAD case the CPU is deaf and + * there are no pending softirqs for us to handle so we can chill. + */ + ASSERT(list_empty(&per_cpu(dpci_list, cpu))); + break; + } + + return NOTIFY_DONE; +} + +static struct notifier_block cpu_nfb = { + .notifier_call = cpu_callback, +}; + +static int __init setup_dpci_softirq(void) +{ + unsigned int cpu; + + for_each_online_cpu(cpu) + INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); + + open_softirq(HVM_DPCI_SOFTIRQ, dpci_softirq); + register_cpu_notifier(&cpu_nfb); + return 0; +} +__initcall(setup_dpci_softirq); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 81e8a3a..78c6977 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,40 +767,51 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - tasklet_kill(&pirq_dpci->tasklet); - - return 0; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } -static void pci_clean_dpci_irqs(struct domain *d) +static int pci_clean_dpci_irqs(struct domain *d) { struct hvm_irq_dpci *hvm_irq_dpci = NULL; if ( !iommu_enabled ) - return; + return 0; if ( !is_hvm_domain(d) ) - return; + return 0; spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + + if ( ret ) + { + spin_unlock(&d->event_lock); + return ret; + } d->arch.hvm_domain.irq.dpci = NULL; free_hvm_irq_dpci(hvm_irq_dpci); } spin_unlock(&d->event_lock); + return 0; } -void pci_release_devices(struct domain *d) +int pci_release_devices(struct domain *d) { struct pci_dev *pdev; u8 bus, devfn; + int ret; spin_lock(&pcidevs_lock); - pci_clean_dpci_irqs(d); + ret = pci_clean_dpci_irqs(d); + if ( ret ) + { + spin_unlock(&pcidevs_lock); + return ret; + } while ( (pdev = pci_get_pdev_by_domain(d, -1, -1, -1)) ) { bus = pdev->bus; @@ -811,6 +822,8 @@ void pci_release_devices(struct domain *d) PCI_SLOT(devfn), PCI_FUNC(devfn)); } spin_unlock(&pcidevs_lock); + + return 0; } #define PCI_CLASS_BRIDGE_HOST 0x0600 diff --git a/xen/include/asm-x86/softirq.h b/xen/include/asm-x86/softirq.h index 7225dea..ec787d6 100644 --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -7,7 +7,8 @@ #define MACHINE_CHECK_SOFTIRQ (NR_COMMON_SOFTIRQS + 3) #define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) -#define NR_ARCH_SOFTIRQS 5 +#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 5) +#define NR_ARCH_SOFTIRQS 6 bool_t arch_skip_send_event_check(unsigned int cpu); diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 94a550a..9709397 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -93,13 +93,13 @@ struct hvm_irq_dpci { /* Machine IRQ to guest device/intx mapping. */ struct hvm_pirq_dpci { uint32_t flags; - bool_t masked; + unsigned int state; uint16_t pending; struct list_head digl_list; struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; - struct tasklet tasklet; + struct list_head softirq_list; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); @@ -109,6 +109,7 @@ int pt_pirq_iterate(struct domain *d, struct hvm_pirq_dpci *, void *arg), void *arg); +bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *); /* Modify state of a PCI INTx wire. */ void hvm_pci_intx_assert( struct domain *d, unsigned int device, unsigned int intx); diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 91520bc..5f295f3 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -99,7 +99,7 @@ struct pci_dev *pci_lock_domain_pdev( void setup_hwdom_pci_devices(struct domain *, int (*)(u8 devfn, struct pci_dev *)); -void pci_release_devices(struct domain *d); +int pci_release_devices(struct domain *d); int pci_add_segment(u16 seg); const unsigned long *pci_get_ro_map(u16 seg); int pci_add_device(u16 seg, u8 bus, u8 devfn, const struct pci_dev_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 Wed Nov 19 04:56:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxJH-0001PG-D9; Wed, 19 Nov 2014 04:56:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJF-0001Oq-PX for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:06 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 56/94-09936-5E22C645; Wed, 19 Nov 2014 04:56:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1416372962!13421905!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7200 invoked from network); 19 Nov 2014 04:56:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:56:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJC-0001t2-Gk for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJC-0007Qt-FS for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:02 +0000 Date: Wed, 19 Nov 2014 04:56:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dpci: replace tasklet with softirq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6dd295381f4b6a66acddacf46bca8940586c8d8 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Nov 12 12:38:08 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:38:08 2014 +0100 dpci: replace tasklet with softirq The existing tasklet mechanism has a single global spinlock that is taken every-time the global list is touched. And we use this lock quite a lot - when we call do_tasklet_work which is called via an softirq and from the idle loop. We take the lock on any operation on the tasklet_list. The problem we are facing is that there are quite a lot of tasklets scheduled. The most common one that is invoked is the one injecting the VIRQ_TIMER in the guest. Guests are not insane and don't set the one-shot or periodic clocks to be in sub 1ms intervals (causing said tasklet to be scheduled for such small intervalls). The problem appears when PCI passthrough devices are used over many sockets and we have an mix of heavy-interrupt guests and idle guests. The idle guests end up seeing 1/10 of its RUNNING timeslice eaten by the hypervisor (and 40% steal time). The mechanism by which we inject PCI interrupts is by hvm_do_IRQ_dpci which schedules the hvm_dirq_assist tasklet every time an interrupt is received. The callchain is: _asm_vmexit_handler -> vmx_vmexit_handler ->vmx_do_extint -> do_IRQ -> __do_IRQ_guest -> hvm_do_IRQ_dpci tasklet_schedule(&dpci->dirq_tasklet); [takes lock to put the tasklet on] [later on the schedule_tail is invoked which is 'vmx_do_resume'] vmx_do_resume -> vmx_asm_do_vmentry -> call vmx_intr_assist -> vmx_process_softirqs -> do_softirq [executes the tasklet function, takes the lock again] While on other CPUs they might be sitting in a idle loop and invoked to deliver an VIRQ_TIMER, which also ends up taking the lock twice: first to schedule the v->arch.hvm_vcpu.assert_evtchn_irq_tasklet (accounted to the guests' BLOCKED_state); then to execute it - which is accounted for in the guest's RUNTIME_state. The end result is that on a 8 socket machine with PCI passthrough, where four sockets are busy with interrupts, and the other sockets have idle guests - we end up with the idle guests having around 40% steal time and 1/10 of its timeslice (3ms out of 30 ms) being tied up taking the lock. The latency of the PCI interrupts delieved to guest is also hindered. With this patch the problem disappears completly. That is removing the lock for the PCI passthrough use-case (the 'hvm_dirq_assist' case) by not using tasklets at all. The patch is simple - instead of scheduling an tasklet we schedule our own softirq - HVM_DPCI_SOFTIRQ, which will take care of running 'hvm_dirq_assist'. The information we need on each CPU is which 'struct hvm_pirq_dpci' structure the 'hvm_dirq_assist' needs to run on. That is simple solved by threading the 'struct hvm_pirq_dpci' through a linked list. The rule of only running one 'hvm_dirq_assist' for only one 'hvm_pirq_dpci' is also preserved by having 'schedule_dpci_for' ignore any subsequent calls for an domain which has already been scheduled. == Code details == Most of the code complexity comes from the '->dom' field in the 'hvm_pirq_dpci' structure. We use it for ref-counting and as such it MUST be valid as long as STATE_SCHED bit is set. Whoever clears the STATE_SCHED bit does the ref-counting and can also reset the '->dom' field. To compound the complexity, there are multiple points where the 'hvm_pirq_dpci' structure is reset or re-used. Initially (first time the domain uses the pirq), the 'hvm_pirq_dpci->dom' field is set to NULL as it is allocated. On subsequent calls in to 'pt_irq_create_bind' the ->dom is whatever it had last time. As this is the initial call (which QEMU ends up calling when the guest writes an vector value in the MSI field) we MUST set the '->dom' to a the proper structure (otherwise we cannot do proper ref-counting). The mechanism to tear it down is more complex as there are three ways it can be executed. To make it simpler everything revolves around 'pt_pirq_softirq_active'. If it returns -EAGAIN that means there is an outstanding softirq that needs to finish running before we can continue tearing down. With that in mind: a) pci_clean_dpci_irq. This gets called when the guest is being destroyed. We end up calling 'pt_pirq_softirq_active' to see if it is OK to continue the destruction. The scenarios in which the 'struct pirq' (and subsequently the 'hvm_pirq_dpci') gets destroyed is when: - guest did not use the pirq at all after setup. - guest did use pirq, but decided to mask and left it in that state. - guest did use pirq, but crashed. In all of those scenarios we end up calling 'pt_pirq_softirq_active' to check if the softirq is still active. Read below on the 'pt_pirq_softirq_active' loop. b) pt_irq_destroy_bind (guest disables the MSI). We double-check that the softirq has run by piggy-backing on the existing 'pirq_cleanup_check' mechanism which calls 'pt_pirq_cleanup_check'. We add the extra call to 'pt_pirq_softirq_active' in 'pt_pirq_cleanup_check'. NOTE: Guests that use event channels unbind first the event channel from PIRQs, so the 'pt_pirq_cleanup_check' won't be called as 'event' is set to zero. In that case we either clean it up via the a) or c) mechanism. There is an extra scenario regardless of 'event' being set or not: the guest did 'pt_irq_destroy_bind' while an interrupt was triggered and softirq was scheduled (but had not been run). It is OK to still run the softirq as hvm_dirq_assist won't do anything (as the flags are set to zero). However we will try to deschedule the softirq if we can (by clearing the STATE_SCHED bit and us doing the ref-counting). c) pt_irq_create_bind (not a typo). The scenarios are: - guest disables the MSI and then enables it (rmmod and modprobe in a loop). We call 'pt_pirq_reset' which checks to see if the softirq has been scheduled. Imagine the 'b)' with interrupts in flight and c) getting called in a loop. We will spin up on 'pt_pirq_is_active' (at the start of the 'pt_irq_create_bind') with the event_lock spinlock dropped and waiting (cpu_relax). We cannot call 'process_pending_softirqs' as it might result in a dead-lock. hvm_dirq_assist will be executed and then the softirq will clear 'state' which signals that that we can re-use the 'hvm_pirq_dpci' structure. In case this softirq is scheduled on a remote CPU the softirq will run on it as the semantics behind an softirq is that it will execute within the guest interruption. - we hit once the error paths in 'pt_irq_create_bind' while an interrupt was triggered and softirq was scheduled. If the softirq is in STATE_RUN that means it is executing and we should let it continue on. We can clear the '->dom' field as the softirq has stashed it beforehand. If the softirq is STATE_SCHED and we are successful in clearing it, we do the ref-counting and clear the '->dom' field. Otherwise we let the softirq continue on and the '->dom' field is left intact. The clearing of the '->dom' is left to a), b) or again c) case. Note that in both cases the 'flags' variable is cleared so hvm_dirq_assist won't actually do anything. Suggested-by: Jan Beulich Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 4 +- xen/drivers/passthrough/io.c | 251 ++++++++++++++++++++++++++++++++++++----- xen/drivers/passthrough/pci.c | 31 ++++-- xen/include/asm-x86/softirq.h | 3 +- xen/include/xen/hvm/irq.h | 5 +- xen/include/xen/pci.h | 2 +- 6 files changed, 255 insertions(+), 41 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ae0a344..73d01bb 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1965,7 +1965,9 @@ int domain_relinquish_resources(struct domain *d) switch ( d->arch.relmem ) { case RELMEM_not_started: - pci_release_devices(d); + ret = pci_release_devices(d); + if ( ret ) + return ret; /* Tear down paging-assistance stuff. */ ret = paging_teardown(d); diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index dceb17e..efc66dc 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -20,14 +20,116 @@ #include #include +#include #include #include #include #include #include -#include -static void hvm_dirq_assist(unsigned long arg); +static DEFINE_PER_CPU(struct list_head, dpci_list); + +/* + * These two bit states help to safely schedule, deschedule, and wait until + * the softirq has finished. + * + * The semantics behind these two bits is as follow: + * - STATE_SCHED - whoever modifies it has to ref-count the domain (->dom). + * - STATE_RUN - only softirq is allowed to set and clear it. If it has + * been set hvm_dirq_assist will RUN with a saved value of the + * 'struct domain' copied from 'pirq_dpci->dom' before STATE_RUN was set. + * + * The usual states are: STATE_SCHED(set) -> STATE_RUN(set) -> + * STATE_SCHED(unset) -> STATE_RUN(unset). + * + * However the states can also diverge such as: STATE_SCHED(set) -> + * STATE_SCHED(unset) -> STATE_RUN(set) -> STATE_RUN(unset). That means + * the 'hvm_dirq_assist' never run and that the softirq did not do any + * ref-counting. + */ + +enum { + STATE_SCHED, + STATE_RUN +}; + +/* + * This can be called multiple times, but the softirq is only raised once. + * That is until the STATE_SCHED state has been cleared. The state can be + * cleared by: the 'dpci_softirq' (when it has executed 'hvm_dirq_assist'), + * or by 'pt_pirq_softirq_reset' (which will try to clear the state before + * the softirq had a chance to run). + */ +static void raise_softirq_for(struct hvm_pirq_dpci *pirq_dpci) +{ + unsigned long flags; + + if ( test_and_set_bit(STATE_SCHED, &pirq_dpci->state) ) + return; + + get_knownalive_domain(pirq_dpci->dom); + + local_irq_save(flags); + list_add_tail(&pirq_dpci->softirq_list, &this_cpu(dpci_list)); + local_irq_restore(flags); + + raise_softirq(HVM_DPCI_SOFTIRQ); +} + +/* + * If we are racing with softirq_dpci (STATE_SCHED) we return + * true. Otherwise we return false. + * + * If it is false, it is the callers responsibility to make sure + * that the softirq (with the event_lock dropped) has ran. + */ +bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *pirq_dpci) +{ + if ( pirq_dpci->state & ((1 << STATE_RUN) | (1 << STATE_SCHED)) ) + return 1; + + /* + * If in the future we would call 'raise_softirq_for' right away + * after 'pt_pirq_softirq_active' we MUST reset the list (otherwise it + * might have stale data). + */ + return 0; +} + +/* + * Reset the pirq_dpci->dom parameter to NULL. + * + * This function checks the different states to make sure it can do it + * at the right time. If it unschedules the 'hvm_dirq_assist' from running + * it also refcounts (which is what the softirq would have done) properly. + */ +static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) +{ + struct domain *d = pirq_dpci->dom; + + ASSERT(spin_is_locked(&d->event_lock)); + + switch ( cmpxchg(&pirq_dpci->state, 1 << STATE_SCHED, 0) ) + { + case (1 << STATE_SCHED): + /* + * We are going to try to de-schedule the softirq before it goes in + * STATE_RUN. Whoever clears STATE_SCHED MUST refcount the 'dom'. + */ + put_domain(d); + /* fallthrough. */ + case (1 << STATE_RUN): + case (1 << STATE_RUN) | (1 << STATE_SCHED): + /* + * The reason it is OK to reset 'dom' when STATE_RUN bit is set is due + * to a shortcut the 'dpci_softirq' implements. It stashes the 'dom' + * in local variable before it sets STATE_RUN - and therefore will not + * dereference '->dom' which would crash. + */ + pirq_dpci->dom = NULL; + break; + } +} bool_t pt_irq_need_timer(uint32_t flags) { @@ -40,7 +142,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->masked = 0; + pirq_dpci->state = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -101,6 +203,7 @@ int pt_irq_create_bind( if ( pirq < 0 || pirq >= d->nr_pirqs ) return -EINVAL; + restart: spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); @@ -128,6 +231,21 @@ int pt_irq_create_bind( } pirq_dpci = pirq_dpci(info); + /* + * A crude 'while' loop with us dropping the spinlock and giving + * the softirq_dpci a chance to run. + * We MUST check for this condition as the softirq could be scheduled + * and hasn't run yet. Note that this code replaced tasklet_kill which + * would have spun forever and would do the same thing (wait to flush out + * outstanding hvm_dirq_assist calls. + */ + if ( pt_pirq_softirq_active(pirq_dpci) ) + { + spin_unlock(&d->event_lock); + cpu_relax(); + goto restart; + } + switch ( pt_irq_bind->irq_type ) { case PT_IRQ_TYPE_MSI: @@ -159,7 +277,16 @@ int pt_irq_create_bind( { rc = msixtbl_pt_register(d, info, pt_irq_bind->u.msi.gtable); if ( unlikely(rc) ) + { pirq_guest_unbind(d, info); + /* + * Between 'pirq_guest_bind' and before 'pirq_guest_unbind' + * an interrupt can be scheduled. No more of them are going + * to be scheduled but we must deal with the one that may be + * in the queue. + */ + pt_pirq_softirq_reset(pirq_dpci); + } } if ( unlikely(rc) ) { @@ -269,6 +396,10 @@ int pt_irq_create_bind( { if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); + /* + * There is no path for __do_IRQ to schedule softirq as + * IRQ_GUEST is not set. As such we can reset 'dom' directly. + */ pirq_dpci->dom = NULL; list_del(&girq->list); list_del(&digl->list); @@ -402,8 +533,13 @@ int pt_irq_destroy_bind( msixtbl_pt_unregister(d, pirq); if ( pt_irq_need_timer(pirq_dpci->flags) ) kill_timer(&pirq_dpci->timer); - pirq_dpci->dom = NULL; pirq_dpci->flags = 0; + /* + * See comment in pt_irq_create_bind's PT_IRQ_TYPE_MSI before the + * call to pt_pirq_softirq_reset. + */ + pt_pirq_softirq_reset(pirq_dpci); + pirq_cleanup_check(pirq, d); } @@ -426,14 +562,12 @@ void pt_pirq_init(struct domain *d, struct hvm_pirq_dpci *dpci) { INIT_LIST_HEAD(&dpci->digl_list); dpci->gmsi.dest_vcpu_id = -1; - softirq_tasklet_init(&dpci->tasklet, hvm_dirq_assist, (unsigned long)dpci); } bool_t pt_pirq_cleanup_check(struct hvm_pirq_dpci *dpci) { - if ( !dpci->flags ) + if ( !dpci->flags && !pt_pirq_softirq_active(dpci) ) { - tasklet_kill(&dpci->tasklet); dpci->dom = NULL; return 1; } @@ -476,8 +610,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; - pirq_dpci->masked = 1; - tasklet_schedule(&pirq_dpci->tasklet); + raise_softirq_for(pirq_dpci); return 1; } @@ -531,28 +664,12 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_dirq_assist(unsigned long arg) +static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) { - struct hvm_pirq_dpci *pirq_dpci = (struct hvm_pirq_dpci *)arg; - struct domain *d = pirq_dpci->dom; - - /* - * We can be racing with 'pt_irq_destroy_bind' - with us being scheduled - * right before 'pirq_guest_unbind' gets called - but us not yet executed. - * - * And '->dom' gets cleared later in the destroy path. We exit and clear - * 'masked' - which is OK as later in this code we would - * do nothing except clear the ->masked field anyhow. - */ - if ( !d ) - { - pirq_dpci->masked = 0; - return; - } ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( test_and_clear_bool(pirq_dpci->masked) ) + if ( pirq_dpci->state ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; @@ -654,3 +771,83 @@ void hvm_dpci_eoi(struct domain *d, unsigned int guest_gsi, unlock: spin_unlock(&d->event_lock); } + +/* + * Note: 'pt_pirq_softirq_reset' can clear the STATE_SCHED before we get to + * doing it. If that is the case we let 'pt_pirq_softirq_reset' do ref-counting. + */ +static void dpci_softirq(void) +{ + unsigned int cpu = smp_processor_id(); + LIST_HEAD(our_list); + + local_irq_disable(); + list_splice_init(&per_cpu(dpci_list, cpu), &our_list); + local_irq_enable(); + + while ( !list_empty(&our_list) ) + { + struct hvm_pirq_dpci *pirq_dpci; + struct domain *d; + + pirq_dpci = list_entry(our_list.next, struct hvm_pirq_dpci, softirq_list); + list_del(&pirq_dpci->softirq_list); + + d = pirq_dpci->dom; + smp_mb(); /* 'd' MUST be saved before we set/clear the bits. */ + if ( test_and_set_bit(STATE_RUN, &pirq_dpci->state) ) + BUG(); + /* + * The one who clears STATE_SCHED MUST refcount the domain. + */ + if ( test_and_clear_bit(STATE_SCHED, &pirq_dpci->state) ) + { + hvm_dirq_assist(d, pirq_dpci); + put_domain(d); + } + clear_bit(STATE_RUN, &pirq_dpci->state); + } +} + +static int cpu_callback( + struct notifier_block *nfb, unsigned long action, void *hcpu) +{ + unsigned int cpu = (unsigned long)hcpu; + + switch ( action ) + { + case CPU_UP_PREPARE: + INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); + break; + case CPU_UP_CANCELED: + case CPU_DEAD: + /* + * On CPU_DYING this callback is called (on the CPU that is dying) + * with an possible HVM_DPIC_SOFTIRQ pending - at which point we can + * clear out any outstanding domains (by the virtue of the idle loop + * calling the softirq later). In CPU_DEAD case the CPU is deaf and + * there are no pending softirqs for us to handle so we can chill. + */ + ASSERT(list_empty(&per_cpu(dpci_list, cpu))); + break; + } + + return NOTIFY_DONE; +} + +static struct notifier_block cpu_nfb = { + .notifier_call = cpu_callback, +}; + +static int __init setup_dpci_softirq(void) +{ + unsigned int cpu; + + for_each_online_cpu(cpu) + INIT_LIST_HEAD(&per_cpu(dpci_list, cpu)); + + open_softirq(HVM_DPCI_SOFTIRQ, dpci_softirq); + register_cpu_notifier(&cpu_nfb); + return 0; +} +__initcall(setup_dpci_softirq); diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 81e8a3a..78c6977 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -767,40 +767,51 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - tasklet_kill(&pirq_dpci->tasklet); - - return 0; + return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; } -static void pci_clean_dpci_irqs(struct domain *d) +static int pci_clean_dpci_irqs(struct domain *d) { struct hvm_irq_dpci *hvm_irq_dpci = NULL; if ( !iommu_enabled ) - return; + return 0; if ( !is_hvm_domain(d) ) - return; + return 0; spin_lock(&d->event_lock); hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + + if ( ret ) + { + spin_unlock(&d->event_lock); + return ret; + } d->arch.hvm_domain.irq.dpci = NULL; free_hvm_irq_dpci(hvm_irq_dpci); } spin_unlock(&d->event_lock); + return 0; } -void pci_release_devices(struct domain *d) +int pci_release_devices(struct domain *d) { struct pci_dev *pdev; u8 bus, devfn; + int ret; spin_lock(&pcidevs_lock); - pci_clean_dpci_irqs(d); + ret = pci_clean_dpci_irqs(d); + if ( ret ) + { + spin_unlock(&pcidevs_lock); + return ret; + } while ( (pdev = pci_get_pdev_by_domain(d, -1, -1, -1)) ) { bus = pdev->bus; @@ -811,6 +822,8 @@ void pci_release_devices(struct domain *d) PCI_SLOT(devfn), PCI_FUNC(devfn)); } spin_unlock(&pcidevs_lock); + + return 0; } #define PCI_CLASS_BRIDGE_HOST 0x0600 diff --git a/xen/include/asm-x86/softirq.h b/xen/include/asm-x86/softirq.h index 7225dea..ec787d6 100644 --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -7,7 +7,8 @@ #define MACHINE_CHECK_SOFTIRQ (NR_COMMON_SOFTIRQS + 3) #define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) -#define NR_ARCH_SOFTIRQS 5 +#define HVM_DPCI_SOFTIRQ (NR_COMMON_SOFTIRQS + 5) +#define NR_ARCH_SOFTIRQS 6 bool_t arch_skip_send_event_check(unsigned int cpu); diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 94a550a..9709397 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -93,13 +93,13 @@ struct hvm_irq_dpci { /* Machine IRQ to guest device/intx mapping. */ struct hvm_pirq_dpci { uint32_t flags; - bool_t masked; + unsigned int state; uint16_t pending; struct list_head digl_list; struct domain *dom; struct hvm_gmsi_info gmsi; struct timer timer; - struct tasklet tasklet; + struct list_head softirq_list; }; void pt_pirq_init(struct domain *, struct hvm_pirq_dpci *); @@ -109,6 +109,7 @@ int pt_pirq_iterate(struct domain *d, struct hvm_pirq_dpci *, void *arg), void *arg); +bool_t pt_pirq_softirq_active(struct hvm_pirq_dpci *); /* Modify state of a PCI INTx wire. */ void hvm_pci_intx_assert( struct domain *d, unsigned int device, unsigned int intx); diff --git a/xen/include/xen/pci.h b/xen/include/xen/pci.h index 91520bc..5f295f3 100644 --- a/xen/include/xen/pci.h +++ b/xen/include/xen/pci.h @@ -99,7 +99,7 @@ struct pci_dev *pci_lock_domain_pdev( void setup_hwdom_pci_devices(struct domain *, int (*)(u8 devfn, struct pci_dev *)); -void pci_release_devices(struct domain *d); +int pci_release_devices(struct domain *d); int pci_add_segment(u16 seg); const unsigned long *pci_get_ro_map(u16 seg); int pci_add_device(u16 seg, u8 bus, u8 devfn, const struct pci_dev_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 Wed Nov 19 04:56:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxJQ-0001RX-JR; Wed, 19 Nov 2014 04:56:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJP-0001RF-HG for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:15 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id BB/43-25727-EE22C645; Wed, 19 Nov 2014 04:56:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1416372972!12322793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26198 invoked from network); 19 Nov 2014 04:56:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:56:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJM-0001t8-NB for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJM-0007RO-KO for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:12 +0000 Date: Wed, 19 Nov 2014 04:56:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] adjust number of domains in cpupools when destroying 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 934e7baa6c12d19cfaf24e8f8e27d6c6a8b8c5e4 Author: Juergen Gross AuthorDate: Wed Nov 12 12:39:58 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:39:58 2014 +0100 adjust number of domains in cpupools when destroying domain Commit bac6334b51d9bcfe57ecf4a4cb5288348fcf044a (move domain to cpupool0 before destroying it) introduced an error in the accounting of cpupools regarding the number of domains. The number of domains is nor adjusted when a domain is moved to cpupool0 in kill_domain(). Correct this by introducing a cpupool function doing the move instead of open coding it by calling sched_move_domain(). Reported-by: Dietmar Hahn Signed-off-by: Juergen Gross Tested-by: Dietmar Hahn Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/cpupool.c | 47 +++++++++++++++++++++++++++++++++-------------- xen/common/domain.c | 2 +- xen/include/xen/sched.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 73249d3..a758a8b 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -225,6 +225,35 @@ static int cpupool_destroy(struct cpupool *c) } /* + * Move domain to another cpupool + */ +static int cpupool_move_domain_locked(struct domain *d, struct cpupool *c) +{ + int ret; + + d->cpupool->n_dom--; + ret = sched_move_domain(d, c); + if ( ret ) + d->cpupool->n_dom++; + else + c->n_dom++; + + return ret; +} +int cpupool_move_domain(struct domain *d, struct cpupool *c) +{ + int ret; + + spin_lock(&cpupool_lock); + + ret = cpupool_move_domain_locked(d, c); + + spin_unlock(&cpupool_lock); + + return ret; +} + +/* * assign a specific cpu to a cpupool * cpupool_lock must be held */ @@ -338,14 +367,9 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) ret = -EBUSY; break; } - c->n_dom--; - ret = sched_move_domain(d, cpupool0); + ret = cpupool_move_domain_locked(d, cpupool0); if ( ret ) - { - c->n_dom++; break; - } - cpupool0->n_dom++; } rcu_read_unlock(&domlist_read_lock); if ( ret ) @@ -613,16 +637,11 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) d->domain_id, op->cpupool_id); ret = -ENOENT; spin_lock(&cpupool_lock); + c = cpupool_find_by_id(op->cpupool_id); if ( (c != NULL) && cpumask_weight(c->cpu_valid) ) - { - d->cpupool->n_dom--; - ret = sched_move_domain(d, c); - if ( ret ) - d->cpupool->n_dom++; - else - c->n_dom++; - } + ret = cpupool_move_domain_locked(d, c); + spin_unlock(&cpupool_lock); cpupool_dprintk("cpupool move_domain(dom=%d)->pool=%d ret %d\n", d->domain_id, op->cpupool_id, ret); diff --git a/xen/common/domain.c b/xen/common/domain.c index a3f51ec..4a62c1d 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -621,7 +621,7 @@ int domain_kill(struct domain *d) rc = -EAGAIN; break; } - if ( sched_move_domain(d, cpupool0) ) + if ( cpupool_move_domain(d, cpupool0) ) return -EAGAIN; for_each_vcpu ( d, v ) unmap_vcpu_info(v); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index c5157e6..46fc6e3 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -871,6 +871,7 @@ struct cpupool *cpupool_get_by_id(int poolid); void cpupool_put(struct cpupool *pool); int cpupool_add_domain(struct domain *d, int poolid); void cpupool_rm_domain(struct domain *d); +int cpupool_move_domain(struct domain *d, struct cpupool *c); int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op); void schedule_dump(struct cpupool *c); extern void dump_runq(unsigned char key); -- generated by git-patchbot for /home/xen/git/xen.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 19 04:56:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxJQ-0001RX-JR; Wed, 19 Nov 2014 04:56:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJP-0001RF-HG for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:15 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id BB/43-25727-EE22C645; Wed, 19 Nov 2014 04:56:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1416372972!12322793!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26198 invoked from network); 19 Nov 2014 04:56:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:56:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJM-0001t8-NB for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJM-0007RO-KO for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:12 +0000 Date: Wed, 19 Nov 2014 04:56:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] adjust number of domains in cpupools when destroying 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 934e7baa6c12d19cfaf24e8f8e27d6c6a8b8c5e4 Author: Juergen Gross AuthorDate: Wed Nov 12 12:39:58 2014 +0100 Commit: Jan Beulich CommitDate: Wed Nov 12 12:39:58 2014 +0100 adjust number of domains in cpupools when destroying domain Commit bac6334b51d9bcfe57ecf4a4cb5288348fcf044a (move domain to cpupool0 before destroying it) introduced an error in the accounting of cpupools regarding the number of domains. The number of domains is nor adjusted when a domain is moved to cpupool0 in kill_domain(). Correct this by introducing a cpupool function doing the move instead of open coding it by calling sched_move_domain(). Reported-by: Dietmar Hahn Signed-off-by: Juergen Gross Tested-by: Dietmar Hahn Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/common/cpupool.c | 47 +++++++++++++++++++++++++++++++++-------------- xen/common/domain.c | 2 +- xen/include/xen/sched.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index 73249d3..a758a8b 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -225,6 +225,35 @@ static int cpupool_destroy(struct cpupool *c) } /* + * Move domain to another cpupool + */ +static int cpupool_move_domain_locked(struct domain *d, struct cpupool *c) +{ + int ret; + + d->cpupool->n_dom--; + ret = sched_move_domain(d, c); + if ( ret ) + d->cpupool->n_dom++; + else + c->n_dom++; + + return ret; +} +int cpupool_move_domain(struct domain *d, struct cpupool *c) +{ + int ret; + + spin_lock(&cpupool_lock); + + ret = cpupool_move_domain_locked(d, c); + + spin_unlock(&cpupool_lock); + + return ret; +} + +/* * assign a specific cpu to a cpupool * cpupool_lock must be held */ @@ -338,14 +367,9 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) ret = -EBUSY; break; } - c->n_dom--; - ret = sched_move_domain(d, cpupool0); + ret = cpupool_move_domain_locked(d, cpupool0); if ( ret ) - { - c->n_dom++; break; - } - cpupool0->n_dom++; } rcu_read_unlock(&domlist_read_lock); if ( ret ) @@ -613,16 +637,11 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) d->domain_id, op->cpupool_id); ret = -ENOENT; spin_lock(&cpupool_lock); + c = cpupool_find_by_id(op->cpupool_id); if ( (c != NULL) && cpumask_weight(c->cpu_valid) ) - { - d->cpupool->n_dom--; - ret = sched_move_domain(d, c); - if ( ret ) - d->cpupool->n_dom++; - else - c->n_dom++; - } + ret = cpupool_move_domain_locked(d, c); + spin_unlock(&cpupool_lock); cpupool_dprintk("cpupool move_domain(dom=%d)->pool=%d ret %d\n", d->domain_id, op->cpupool_id, ret); diff --git a/xen/common/domain.c b/xen/common/domain.c index a3f51ec..4a62c1d 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -621,7 +621,7 @@ int domain_kill(struct domain *d) rc = -EAGAIN; break; } - if ( sched_move_domain(d, cpupool0) ) + if ( cpupool_move_domain(d, cpupool0) ) return -EAGAIN; for_each_vcpu ( d, v ) unmap_vcpu_info(v); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index c5157e6..46fc6e3 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -871,6 +871,7 @@ struct cpupool *cpupool_get_by_id(int poolid); void cpupool_put(struct cpupool *pool); int cpupool_add_domain(struct domain *d, int poolid); void cpupool_rm_domain(struct domain *d); +int cpupool_move_domain(struct domain *d, struct cpupool *c); int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op); void schedule_dump(struct cpupool *c); extern void dump_runq(unsigned char key); -- generated by git-patchbot for /home/xen/git/xen.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 19 04:56:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:56:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJa-0001TM-OH; Wed, 19 Nov 2014 04:56:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJZ-0001T3-Hr for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:25 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id F7/BD-28296-8F22C645; Wed, 19 Nov 2014 04:56:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1416372983!12189265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14384 invoked from network); 19 Nov 2014 04:56:24 -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; 19 Nov 2014 04:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJW-0001tE-Sx for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJW-0007Rk-Rq for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:22 +0000 Date: Wed, 19 Nov 2014 04:56:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: use configure --sysconfdir result X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 484904420dd35f30d210c04c39a15bbf402242b9 Author: Olaf Hering AuthorDate: Tue Oct 14 08:55:23 2014 +0200 Commit: Ian Campbell CommitDate: Fri Nov 14 09:55:12 2014 +0000 tools/hotplug: use configure --sysconfdir result ... instead of hardcoding values and guess where they config files may be. Also use the result of --with-sysconfig-leaf-dir. Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Acked-by: Ian Campbell --- tools/hotplug/Linux/init.d/xencommons.in | 6 +----- .../Linux/systemd/var-lib-xenstored.mount.in | 3 +-- .../systemd/xen-qemu-dom0-disk-backend.service.in | 3 +-- tools/hotplug/Linux/systemd/xenconsoled.service.in | 3 +-- tools/hotplug/Linux/systemd/xenstored.service.in | 3 +-- tools/hotplug/Linux/xendomains.in | 6 +----- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index d53a1f3..a1095c2 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -23,11 +23,7 @@ BACKEND_MODULES="@LINUX_BACKEND_MODULES@" . @XEN_SCRIPT_DIR@/hotplugpath.sh -if [ -d /etc/sysconfig ]; then - xencommons_config=/etc/sysconfig -else - xencommons_config=/etc/default -fi +xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@ test -f $xencommons_config/xencommons && . $xencommons_config/xencommons diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in index 6c46be3..d5e04db 100644 --- a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -7,8 +7,7 @@ RefuseManualStop=true [Mount] Environment=XENSTORED_MOUNT_CTX=none -EnvironmentFile=-/etc/sysconfig/xenstored -EnvironmentFile=-/etc/default/xenstored +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored What=xenstore Where=@XEN_LIB_STORED@ Type=tmpfs diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 1e21abb..6b9c96e 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -8,8 +8,7 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple -EnvironmentFile=-/etc/default/xenstored -EnvironmentFile=-/etc/sysconfig/xenstored +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index e6cb853..2c5d99f 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -9,8 +9,7 @@ Type=simple Environment=XENCONSOLED_ARGS= Environment=XENCONSOLED_LOG=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console -EnvironmentFile=-/etc/default/xenconsoled -EnvironmentFile=-/etc/sysconfig/xenconsoled +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 45fc0f2..780bdd6 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -11,8 +11,7 @@ Type=notify Environment=XENSTORED_ARGS= Environment=XENSTORED_ROOTDIR=@XEN_LIB_STORED@ Environment=XENSTORED=@XENSTORED@ -EnvironmentFile=-/etc/default/xencommons -EnvironmentFile=-/etc/sysconfig/xencommons +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb* ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index de711b7..2e65ac6 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -51,11 +51,7 @@ fi LOCKFILE=${XEN_LOCK_DIR}/xendomains -if [ -d /etc/sysconfig ]; then - XENDOM_CONFIG=/etc/sysconfig/xendomains -else - XENDOM_CONFIG=/etc/default/xendomains -fi +XENDOM_CONFIG=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xendomains test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 04:56:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:56:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJa-0001TM-OH; Wed, 19 Nov 2014 04:56:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJZ-0001T3-Hr for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:25 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id F7/BD-28296-8F22C645; Wed, 19 Nov 2014 04:56:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1416372983!12189265!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14384 invoked from network); 19 Nov 2014 04:56:24 -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; 19 Nov 2014 04:56:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJW-0001tE-Sx for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJW-0007Rk-Rq for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:22 +0000 Date: Wed, 19 Nov 2014 04:56:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: use configure --sysconfdir result X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 484904420dd35f30d210c04c39a15bbf402242b9 Author: Olaf Hering AuthorDate: Tue Oct 14 08:55:23 2014 +0200 Commit: Ian Campbell CommitDate: Fri Nov 14 09:55:12 2014 +0000 tools/hotplug: use configure --sysconfdir result ... instead of hardcoding values and guess where they config files may be. Also use the result of --with-sysconfig-leaf-dir. Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu Acked-by: Ian Campbell --- tools/hotplug/Linux/init.d/xencommons.in | 6 +----- .../Linux/systemd/var-lib-xenstored.mount.in | 3 +-- .../systemd/xen-qemu-dom0-disk-backend.service.in | 3 +-- tools/hotplug/Linux/systemd/xenconsoled.service.in | 3 +-- tools/hotplug/Linux/systemd/xenstored.service.in | 3 +-- tools/hotplug/Linux/xendomains.in | 6 +----- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in index d53a1f3..a1095c2 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in +++ b/tools/hotplug/Linux/init.d/xencommons.in @@ -23,11 +23,7 @@ BACKEND_MODULES="@LINUX_BACKEND_MODULES@" . @XEN_SCRIPT_DIR@/hotplugpath.sh -if [ -d /etc/sysconfig ]; then - xencommons_config=/etc/sysconfig -else - xencommons_config=/etc/default -fi +xencommons_config=@CONFIG_DIR@/@CONFIG_LEAF_DIR@ test -f $xencommons_config/xencommons && . $xencommons_config/xencommons diff --git a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in index 6c46be3..d5e04db 100644 --- a/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in +++ b/tools/hotplug/Linux/systemd/var-lib-xenstored.mount.in @@ -7,8 +7,7 @@ RefuseManualStop=true [Mount] Environment=XENSTORED_MOUNT_CTX=none -EnvironmentFile=-/etc/sysconfig/xenstored -EnvironmentFile=-/etc/default/xenstored +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored What=xenstore Where=@XEN_LIB_STORED@ Type=tmpfs diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 1e21abb..6b9c96e 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -8,8 +8,7 @@ ConditionPathExists=/proc/xen/capabilities [Service] Type=simple -EnvironmentFile=-/etc/default/xenstored -EnvironmentFile=-/etc/sysconfig/xenstored +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenstored PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index e6cb853..2c5d99f 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -9,8 +9,7 @@ Type=simple Environment=XENCONSOLED_ARGS= Environment=XENCONSOLED_LOG=none Environment=XENCONSOLED_LOG_DIR=@XEN_LOG_DIR@/console -EnvironmentFile=-/etc/default/xenconsoled -EnvironmentFile=-/etc/sysconfig/xenconsoled +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xenconsoled PIDFile=@XEN_RUN_DIR@/xenconsoled.pid ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=/bin/mkdir -p ${XENCONSOLED_LOG_DIR} diff --git a/tools/hotplug/Linux/systemd/xenstored.service.in b/tools/hotplug/Linux/systemd/xenstored.service.in index 45fc0f2..780bdd6 100644 --- a/tools/hotplug/Linux/systemd/xenstored.service.in +++ b/tools/hotplug/Linux/systemd/xenstored.service.in @@ -11,8 +11,7 @@ Type=notify Environment=XENSTORED_ARGS= Environment=XENSTORED_ROOTDIR=@XEN_LIB_STORED@ Environment=XENSTORED=@XENSTORED@ -EnvironmentFile=-/etc/default/xencommons -EnvironmentFile=-/etc/sysconfig/xencommons +EnvironmentFile=-@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xencommons ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities ExecStartPre=-/bin/rm -f @XEN_LIB_STORED@/tdb* ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@ diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index de711b7..2e65ac6 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -51,11 +51,7 @@ fi LOCKFILE=${XEN_LOCK_DIR}/xendomains -if [ -d /etc/sysconfig ]; then - XENDOM_CONFIG=/etc/sysconfig/xendomains -else - XENDOM_CONFIG=/etc/default/xendomains -fi +XENDOM_CONFIG=@CONFIG_DIR@/@CONFIG_LEAF_DIR@/xendomains test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 04:56:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxJk-0001V6-RJ; Wed, 19 Nov 2014 04:56:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJj-0001Ur-L3 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:35 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 67/60-27623-2032C645; Wed, 19 Nov 2014 04:56:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1416372993!12314629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31668 invoked from network); 19 Nov 2014 04:56:34 -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 2014 04:56:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJh-0001tM-1W for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJh-0007St-0V for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:33 +0000 Date: Wed, 19 Nov 2014 04:56:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: correct test condition on libxl_domain_info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9911be0a5135af26fb6c435089beff854e283f8 Author: Wei Liu AuthorDate: Wed Nov 12 11:05:58 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 14 09:56:37 2014 +0000 xl: correct test condition on libxl_domain_info The `if' statement considered return value 0 from libxl_domain_info an error, while 0 actually means success. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson 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 3c9f146..9afef3f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7908,7 +7908,7 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) /* Each domain */ if (domid != INVALID_DOMID) { libxl_dominfo dominfo; - if (!libxl_domain_info(ctx, &dominfo, domid)) { + if (libxl_domain_info(ctx, &dominfo, domid)) { fprintf(stderr, "Failed to get domain info for %d\n", domid); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 04:56:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxJk-0001V6-RJ; Wed, 19 Nov 2014 04:56:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJj-0001Ur-L3 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:35 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 67/60-27623-2032C645; Wed, 19 Nov 2014 04:56:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1416372993!12314629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31668 invoked from network); 19 Nov 2014 04:56:34 -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 2014 04:56:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJh-0001tM-1W for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJh-0007St-0V for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:33 +0000 Date: Wed, 19 Nov 2014 04:56:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: correct test condition on libxl_domain_info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9911be0a5135af26fb6c435089beff854e283f8 Author: Wei Liu AuthorDate: Wed Nov 12 11:05:58 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 14 09:56:37 2014 +0000 xl: correct test condition on libxl_domain_info The `if' statement considered return value 0 from libxl_domain_info an error, while 0 actually means success. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson 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 3c9f146..9afef3f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7908,7 +7908,7 @@ static int psr_cmt_show_cache_occupancy(uint32_t domid) /* Each domain */ if (domid != INVALID_DOMID) { libxl_dominfo dominfo; - if (!libxl_domain_info(ctx, &dominfo, domid)) { + if (libxl_domain_info(ctx, &dominfo, domid)) { fprintf(stderr, "Failed to get domain info for %d\n", domid); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 04:56:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:56: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 1XqxJu-0001Wp-Uv; Wed, 19 Nov 2014 04:56:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJt-0001WW-Jk for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:45 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id DA/61-09842-D032C645; Wed, 19 Nov 2014 04:56:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1416373003!13776269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25378 invoked from network); 19 Nov 2014 04:56:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:56:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJr-0001tS-5X for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJr-0007TF-4X for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:43 +0000 Date: Wed, 19 Nov 2014 04:56:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vTPM: Fix Atmel timeout bug. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f804eee318eeeb2fa5202f155c360ede02010d20 Author: Emil Condrea AuthorDate: Thu Oct 30 15:05:30 2014 +0200 Commit: Ian Campbell CommitDate: Fri Nov 14 10:13:23 2014 +0000 vTPM: Fix Atmel timeout bug. Some versions of Atmel TPMs provide invalid values for TPM_CAP_PROP_TIS_TIMEOUT query. Because timeouts are invalid, every other command after tpm_get_timeouts will fail. It is a known issue and it was fixed recently in linux kernel tpm_tis.c on 2014-07-29. This patch does not allow timeouts to be less than standard values. I tested it on a Dell Latitude E5520 and after making the changes I was able to start vtpmmgr-stubdom. Signed-off-by: Emil Condrea Acked-by: Daniel De Graaf --- extras/mini-os/tpm_tis.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c index b067cb7..d78c465 100644 --- a/extras/mini-os/tpm_tis.c +++ b/extras/mini-os/tpm_tis.c @@ -33,6 +33,11 @@ #ifndef min #define min( a, b ) ( ((a) < (b)) ? (a) : (b) ) #endif +#define ADJUST_TIMEOUTS_TO_STANDARD(initial,standard,timeout_no) \ + if((initial) < (standard)){ \ + (initial) = (standard); \ + printk("Timeout %c was adjusted to standard value.\n",timeout_no); \ + } #define TPM_HEADER_SIZE 10 @@ -997,15 +1002,22 @@ int tpm_get_timeouts(struct tpm_chip *chip) } if (timeout) chip->timeout_a = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_a,MILLISECS(TIS_SHORT_TIMEOUT),'a'); + timeout = be32_to_cpu(timeout_cap->b); if (timeout) chip->timeout_b = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_b,MILLISECS(TIS_LONG_TIMEOUT),'b'); + timeout = be32_to_cpu(timeout_cap->c); if (timeout) chip->timeout_c = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_c,MILLISECS(TIS_SHORT_TIMEOUT),'c'); + timeout = be32_to_cpu(timeout_cap->d); if (timeout) chip->timeout_d = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_d,MILLISECS(TIS_SHORT_TIMEOUT),'d'); duration: tpm_cmd.header.in = tpm_getcap_header; -- generated by git-patchbot for /home/xen/git/xen.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 19 04:56:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:56: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 1XqxJu-0001Wp-Uv; Wed, 19 Nov 2014 04:56:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJt-0001WW-Jk for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:45 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id DA/61-09842-D032C645; Wed, 19 Nov 2014 04:56:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1416373003!13776269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25378 invoked from network); 19 Nov 2014 04:56:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:56:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxJr-0001tS-5X for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxJr-0007TF-4X for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:43 +0000 Date: Wed, 19 Nov 2014 04:56:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vTPM: Fix Atmel timeout bug. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f804eee318eeeb2fa5202f155c360ede02010d20 Author: Emil Condrea AuthorDate: Thu Oct 30 15:05:30 2014 +0200 Commit: Ian Campbell CommitDate: Fri Nov 14 10:13:23 2014 +0000 vTPM: Fix Atmel timeout bug. Some versions of Atmel TPMs provide invalid values for TPM_CAP_PROP_TIS_TIMEOUT query. Because timeouts are invalid, every other command after tpm_get_timeouts will fail. It is a known issue and it was fixed recently in linux kernel tpm_tis.c on 2014-07-29. This patch does not allow timeouts to be less than standard values. I tested it on a Dell Latitude E5520 and after making the changes I was able to start vtpmmgr-stubdom. Signed-off-by: Emil Condrea Acked-by: Daniel De Graaf --- extras/mini-os/tpm_tis.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c index b067cb7..d78c465 100644 --- a/extras/mini-os/tpm_tis.c +++ b/extras/mini-os/tpm_tis.c @@ -33,6 +33,11 @@ #ifndef min #define min( a, b ) ( ((a) < (b)) ? (a) : (b) ) #endif +#define ADJUST_TIMEOUTS_TO_STANDARD(initial,standard,timeout_no) \ + if((initial) < (standard)){ \ + (initial) = (standard); \ + printk("Timeout %c was adjusted to standard value.\n",timeout_no); \ + } #define TPM_HEADER_SIZE 10 @@ -997,15 +1002,22 @@ int tpm_get_timeouts(struct tpm_chip *chip) } if (timeout) chip->timeout_a = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_a,MILLISECS(TIS_SHORT_TIMEOUT),'a'); + timeout = be32_to_cpu(timeout_cap->b); if (timeout) chip->timeout_b = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_b,MILLISECS(TIS_LONG_TIMEOUT),'b'); + timeout = be32_to_cpu(timeout_cap->c); if (timeout) chip->timeout_c = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_c,MILLISECS(TIS_SHORT_TIMEOUT),'c'); + timeout = be32_to_cpu(timeout_cap->d); if (timeout) chip->timeout_d = MICROSECS(timeout * scale); /*Convert to msec */ + ADJUST_TIMEOUTS_TO_STANDARD(chip->timeout_d,MILLISECS(TIS_SHORT_TIMEOUT),'d'); duration: tpm_cmd.header.in = tpm_getcap_header; -- generated by git-patchbot for /home/xen/git/xen.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 19 04:56:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxK7-0001YJ-C6; Wed, 19 Nov 2014 04:56:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxK3-0001Xu-F1 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:56 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id B0/CA-28865-6132C645; Wed, 19 Nov 2014 04:56:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1416373013!6733993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23509 invoked from network); 19 Nov 2014 04:56:54 -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; 19 Nov 2014 04:56:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxK1-0001tf-Ad for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxK1-0007Tc-8p for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:53 +0000 Date: Wed, 19 Nov 2014 04:56:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add missing action in DEFINE_DEVICE_ADD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 902dfd33da08169f08a593a4ef2c45d825cca8c8 Author: Wei Liu AuthorDate: Wed Nov 12 10:39:31 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 14 10:42:57 2014 +0000 libxl: add missing action in DEFINE_DEVICE_ADD ... otherwise when device add operation fails, the error message looks like "libxl: error: libxl.c:1897:device_addrm_aocomplete: unable to (null) device", which is not very helpful. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f7961f6..de23fec 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4164,6 +4164,7 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) \ GCNEW(aodev); \ libxl__prepare_ao_device(ao, aodev); \ + aodev->action = LIBXL__DEVICE_ACTION_ADD; \ aodev->callback = device_addrm_aocomplete; \ aodev->update_json = true; \ libxl__device_##type##_add(egc, domid, type, aodev); \ -- generated by git-patchbot for /home/xen/git/xen.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 19 04:56:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04: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 1XqxK7-0001YJ-C6; Wed, 19 Nov 2014 04:56:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxK3-0001Xu-F1 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:56 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id B0/CA-28865-6132C645; Wed, 19 Nov 2014 04:56:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1416373013!6733993!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23509 invoked from network); 19 Nov 2014 04:56:54 -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; 19 Nov 2014 04:56:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxK1-0001tf-Ad for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxK1-0007Tc-8p for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:56:53 +0000 Date: Wed, 19 Nov 2014 04:56:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add missing action in DEFINE_DEVICE_ADD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 902dfd33da08169f08a593a4ef2c45d825cca8c8 Author: Wei Liu AuthorDate: Wed Nov 12 10:39:31 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 14 10:42:57 2014 +0000 libxl: add missing action in DEFINE_DEVICE_ADD ... otherwise when device add operation fails, the error message looks like "libxl: error: libxl.c:1897:device_addrm_aocomplete: unable to (null) device", which is not very helpful. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f7961f6..de23fec 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4164,6 +4164,7 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) \ GCNEW(aodev); \ libxl__prepare_ao_device(ao, aodev); \ + aodev->action = LIBXL__DEVICE_ACTION_ADD; \ aodev->callback = device_addrm_aocomplete; \ aodev->update_json = true; \ libxl__device_##type##_add(egc, domid, type, aodev); \ -- generated by git-patchbot for /home/xen/git/xen.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 19 04:57:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:57: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 1XqxKG-0001aK-Fp; Wed, 19 Nov 2014 04:57:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKF-0001a3-EY for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:07 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 34/C1-09842-2232C645; Wed, 19 Nov 2014 04:57:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1416373025!13764486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6849 invoked from network); 19 Nov 2014 04:57:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:57:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKB-0001uC-Hg for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxKB-0007UA-F3 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:03 +0000 Date: Wed, 19 Nov 2014 04:57:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: (allow to) override LIST_POISON* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 404227138e1e49c8073e946649a8d4173b35625c Author: Jan Beulich AuthorDate: Mon Nov 17 15:05:53 2014 +0100 Commit: Jan Beulich CommitDate: Mon Nov 17 15:05:53 2014 +0100 x86: (allow to) override LIST_POISON* Having these point into space not controlled by the hypervisor provides an unnecessary attack surface. Allow architectures to override them and utilize that override to make them non-canonical addresses (thus causing #GP rather than #PF when dereferenced). Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Konrad Rzeszutek Wilk --- xen/include/asm-x86/config.h | 4 ++++ xen/include/xen/list.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 210ff57..3802721 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -106,6 +106,10 @@ /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) +/* Override include/xen/list.h to make these non-canonical addresses. */ +#define LIST_POISON1 ((void *)0x0100100100100100UL) +#define LIST_POISON2 ((void *)0x0200200200200200UL) + #ifndef __ASSEMBLY__ extern unsigned long trampoline_phys; #define bootsym_phys(sym) \ diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h index 88dc7eb..59cf571 100644 --- a/xen/include/xen/list.h +++ b/xen/include/xen/list.h @@ -10,12 +10,15 @@ #include #include -/* These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses - * non-initialized list entries. +/* + * These are non-NULL pointers that will result in faults under normal + * circumstances, used to verify that nobody uses non-initialized list + * entries. Architectures can override these. */ +#ifndef LIST_POISON1 #define LIST_POISON1 ((void *) 0x00100100) #define LIST_POISON2 ((void *) 0x00200200) +#endif /* * Simple doubly linked list implementation. -- generated by git-patchbot for /home/xen/git/xen.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 19 04:57:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:57: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 1XqxKG-0001aK-Fp; Wed, 19 Nov 2014 04:57:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKF-0001a3-EY for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:07 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 34/C1-09842-2232C645; Wed, 19 Nov 2014 04:57:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1416373025!13764486!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6849 invoked from network); 19 Nov 2014 04:57:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 04:57:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKB-0001uC-Hg for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxKB-0007UA-F3 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:03 +0000 Date: Wed, 19 Nov 2014 04:57:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: (allow to) override LIST_POISON* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 404227138e1e49c8073e946649a8d4173b35625c Author: Jan Beulich AuthorDate: Mon Nov 17 15:05:53 2014 +0100 Commit: Jan Beulich CommitDate: Mon Nov 17 15:05:53 2014 +0100 x86: (allow to) override LIST_POISON* Having these point into space not controlled by the hypervisor provides an unnecessary attack surface. Allow architectures to override them and utilize that override to make them non-canonical addresses (thus causing #GP rather than #PF when dereferenced). Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Konrad Rzeszutek Wilk --- xen/include/asm-x86/config.h | 4 ++++ xen/include/xen/list.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 210ff57..3802721 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -106,6 +106,10 @@ /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) +/* Override include/xen/list.h to make these non-canonical addresses. */ +#define LIST_POISON1 ((void *)0x0100100100100100UL) +#define LIST_POISON2 ((void *)0x0200200200200200UL) + #ifndef __ASSEMBLY__ extern unsigned long trampoline_phys; #define bootsym_phys(sym) \ diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h index 88dc7eb..59cf571 100644 --- a/xen/include/xen/list.h +++ b/xen/include/xen/list.h @@ -10,12 +10,15 @@ #include #include -/* These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses - * non-initialized list entries. +/* + * These are non-NULL pointers that will result in faults under normal + * circumstances, used to verify that nobody uses non-initialized list + * entries. Architectures can override these. */ +#ifndef LIST_POISON1 #define LIST_POISON1 ((void *) 0x00100100) #define LIST_POISON2 ((void *) 0x00200200) +#endif /* * Simple doubly linked list implementation. -- generated by git-patchbot for /home/xen/git/xen.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 19 04:57:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:57: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 1XqxKQ-0001cN-Ig; Wed, 19 Nov 2014 04:57:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKP-0001c6-Qc for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:18 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 62/35-22737-D232C645; Wed, 19 Nov 2014 04:57:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1416373035!12121231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11165 invoked from network); 19 Nov 2014 04:57:16 -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; 19 Nov 2014 04:57:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKN-0001uK-9Q for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxKN-0007UY-5G for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:15 +0000 Date: Wed, 19 Nov 2014 04:57:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: allow retry of ExitBootServices() call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0540b854f6733759593e829bc3f13c9b45974e32 Author: Jan Beulich AuthorDate: Mon Nov 17 15:07:03 2014 +0100 Commit: Jan Beulich CommitDate: Mon Nov 17 15:07:03 2014 +0100 EFI: allow retry of ExitBootServices() call The specification is kind of vague under what conditions ExitBootServices() may legitimately fail, requiring the OS loader to retry: "If MapKey value is incorrect, ExitBootServices() returns EFI_INVALID_PARAMETER and GetMemoryMap() with ExitBootServices() must be called again. Firmware implementation may choose to do a partial shutdown of the boot services during the first call to ExitBootServices(). EFI OS loader should not make calls to any boot service function other then GetMemoryMap() after the first call to ExitBootServices()." While our code guarantees the map key to be valid, there are systems where a firmware internal notification sent while processing ExitBootServices() reportedly results in changes to the memory map. In that case, make a best effort second try: Avoid any boot service calls other than the two named above, with the possible exception of error paths. Those aren't a problem, since if we end up needing to retry, we're hosed when something goes wrong as much as if we didn't make the retry attempt. For x86, a minimal adjustment to efi_arch_process_memory_map() is needed for it to cope with potentially being called a second time. For arm64, while efi_process_memory_map_bootinfo() is easy to verify that it can safely be called more than once without violating spec constraints, it's not so obvious for fdt_add_uefi_nodes(), hence a step by step approach: - deletion of memory nodes and memory reserve map entries: the 2nd pass shouldn't find any as the 1st one deleted them all, - a "chosen" node should be found as it got added in the 1st pass, - the various "linux,uefi-*" nodes all got added during the 1st pass and hence only their contents may get updated. Signed-off-by: Jan Beulich Reviewed-by: Roy Franz Release-acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/efi/efi-boot.h | 2 +- xen/common/efi/boot.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 454ffb6..3a3b4fe 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -140,7 +140,7 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, /* Populate E820 table and check trampoline area availability. */ e = e820map - 1; - for ( i = 0; i < map_size; i += desc_size ) + for ( e820nr = i = 0; i < map_size; i += desc_size ) { EFI_MEMORY_DESCRIPTOR *desc = map + i; u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3c63c0a..c68efdb 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -703,7 +703,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; union string section = { NULL }, name; - bool_t base_video = 0; + bool_t base_video = 0, retry; char *option_str; bool_t use_cfg_file; @@ -1051,17 +1051,23 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); - if ( EFI_ERROR(status) ) - PrintErrMesg(L"Cannot obtain memory map", status); + for ( retry = 0; ; retry = 1 ) + { + status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, + &efi_mdesc_size, &mdesc_ver); + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot obtain memory map", status); - efi_arch_process_memory_map(SystemTable, efi_memmap, efi_memmap_size, - efi_mdesc_size, mdesc_ver); + efi_arch_process_memory_map(SystemTable, efi_memmap, efi_memmap_size, + efi_mdesc_size, mdesc_ver); - efi_arch_pre_exit_boot(); + efi_arch_pre_exit_boot(); + + status = efi_bs->ExitBootServices(ImageHandle, map_key); + if ( status != EFI_INVALID_PARAMETER || retry ) + break; + } - status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot exit boot services", 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 Wed Nov 19 04:57:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 04:57: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 1XqxKQ-0001cN-Ig; Wed, 19 Nov 2014 04:57:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKP-0001c6-Qc for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:18 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 62/35-22737-D232C645; Wed, 19 Nov 2014 04:57:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1416373035!12121231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11165 invoked from network); 19 Nov 2014 04:57:16 -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; 19 Nov 2014 04:57:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XqxKN-0001uK-9Q for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XqxKN-0007UY-5G for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 04:57:15 +0000 Date: Wed, 19 Nov 2014 04:57:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] EFI: allow retry of ExitBootServices() call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0540b854f6733759593e829bc3f13c9b45974e32 Author: Jan Beulich AuthorDate: Mon Nov 17 15:07:03 2014 +0100 Commit: Jan Beulich CommitDate: Mon Nov 17 15:07:03 2014 +0100 EFI: allow retry of ExitBootServices() call The specification is kind of vague under what conditions ExitBootServices() may legitimately fail, requiring the OS loader to retry: "If MapKey value is incorrect, ExitBootServices() returns EFI_INVALID_PARAMETER and GetMemoryMap() with ExitBootServices() must be called again. Firmware implementation may choose to do a partial shutdown of the boot services during the first call to ExitBootServices(). EFI OS loader should not make calls to any boot service function other then GetMemoryMap() after the first call to ExitBootServices()." While our code guarantees the map key to be valid, there are systems where a firmware internal notification sent while processing ExitBootServices() reportedly results in changes to the memory map. In that case, make a best effort second try: Avoid any boot service calls other than the two named above, with the possible exception of error paths. Those aren't a problem, since if we end up needing to retry, we're hosed when something goes wrong as much as if we didn't make the retry attempt. For x86, a minimal adjustment to efi_arch_process_memory_map() is needed for it to cope with potentially being called a second time. For arm64, while efi_process_memory_map_bootinfo() is easy to verify that it can safely be called more than once without violating spec constraints, it's not so obvious for fdt_add_uefi_nodes(), hence a step by step approach: - deletion of memory nodes and memory reserve map entries: the 2nd pass shouldn't find any as the 1st one deleted them all, - a "chosen" node should be found as it got added in the 1st pass, - the various "linux,uefi-*" nodes all got added during the 1st pass and hence only their contents may get updated. Signed-off-by: Jan Beulich Reviewed-by: Roy Franz Release-acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/efi/efi-boot.h | 2 +- xen/common/efi/boot.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 454ffb6..3a3b4fe 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -140,7 +140,7 @@ static void __init efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable, /* Populate E820 table and check trampoline area availability. */ e = e820map - 1; - for ( i = 0; i < map_size; i += desc_size ) + for ( e820nr = i = 0; i < map_size; i += desc_size ) { EFI_MEMORY_DESCRIPTOR *desc = map + i; u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 3c63c0a..c68efdb 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -703,7 +703,7 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_PROTOCOL *gop = NULL; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; union string section = { NULL }, name; - bool_t base_video = 0; + bool_t base_video = 0, retry; char *option_str; bool_t use_cfg_file; @@ -1051,17 +1051,23 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( !efi_memmap ) blexit(L"Unable to allocate memory for EFI memory map"); - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); - if ( EFI_ERROR(status) ) - PrintErrMesg(L"Cannot obtain memory map", status); + for ( retry = 0; ; retry = 1 ) + { + status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, + &efi_mdesc_size, &mdesc_ver); + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot obtain memory map", status); - efi_arch_process_memory_map(SystemTable, efi_memmap, efi_memmap_size, - efi_mdesc_size, mdesc_ver); + efi_arch_process_memory_map(SystemTable, efi_memmap, efi_memmap_size, + efi_mdesc_size, mdesc_ver); - efi_arch_pre_exit_boot(); + efi_arch_pre_exit_boot(); + + status = efi_bs->ExitBootServices(ImageHandle, map_key); + if ( status != EFI_INVALID_PARAMETER || retry ) + break; + } - status = efi_bs->ExitBootServices(ImageHandle, map_key); if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot exit boot services", 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 Wed Nov 19 15:44:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 15: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 1Xr7QN-0001Rz-3x; Wed, 19 Nov 2014 15: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 1Xr7QL-0001Rs-UU for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:06 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 81/B1-25714-5CABC645; Wed, 19 Nov 2014 15:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1416411843!12282084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6881 invoked from network); 19 Nov 2014 15:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 15:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7QJ-0000wq-OI for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xr7QJ-0006Eg-H9 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:03 +0000 Date: Wed, 19 Nov 2014 15:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't allow page table updates on non-PV page tables in do_mmu_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 2693b755b559ca007599572837f7e83ebdd1681c Author: Jan Beulich AuthorDate: Tue Nov 18 14:27:46 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:27:46 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: e4292c5aac41b80f33d4877104348d5ee7c95aa4 master date: 2014-11-18 14:15:21 +0100 --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 486e520..d1e0346 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3509,6 +3509,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + xsm_needed |= XSM_MMU_NORMAL_UPDATE; if ( get_pte_flags(req.val) & _PAGE_PRESENT ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 15:44:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 15: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 1Xr7QN-0001Rz-3x; Wed, 19 Nov 2014 15: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 1Xr7QL-0001Rs-UU for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:06 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 81/B1-25714-5CABC645; Wed, 19 Nov 2014 15:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1416411843!12282084!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6881 invoked from network); 19 Nov 2014 15:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Nov 2014 15:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7QJ-0000wq-OI for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xr7QJ-0006Eg-H9 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:03 +0000 Date: Wed, 19 Nov 2014 15:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: don't allow page table updates on non-PV page tables in do_mmu_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 2693b755b559ca007599572837f7e83ebdd1681c Author: Jan Beulich AuthorDate: Tue Nov 18 14:27:46 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:27:46 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: e4292c5aac41b80f33d4877104348d5ee7c95aa4 master date: 2014-11-18 14:15:21 +0100 --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 486e520..d1e0346 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3509,6 +3509,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + xsm_needed |= XSM_MMU_NORMAL_UPDATE; if ( get_pte_flags(req.val) & _PAGE_PRESENT ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 15:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 15: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 1Xr7QY-0001Tc-6e; Wed, 19 Nov 2014 15:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7QW-0001TJ-RU for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F7/4C-23865-0DABC645; Wed, 19 Nov 2014 15:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1416411854!12419929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11993 invoked from network); 19 Nov 2014 15:44: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; 19 Nov 2014 15:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7QU-0000ww-2N for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xr7QU-0006F9-07 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:14 +0000 Date: Wed, 19 Nov 2014 15:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d279f6e1344871d71e379cc06c7baa6d4f9f0b29 Author: Jan Beulich AuthorDate: Tue Nov 18 14:28:45 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:28:45 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 1d68c1a70e00ed95ef0889cfa005379dab27b37d master date: 2014-11-18 14:16:23 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5fbe024..25571c6 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1114,7 +1114,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1180,9 +1180,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1247,7 +1261,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1256,7 +1270,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -1888,7 +1902,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2242,7 +2256,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2323,7 +2337,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2547,7 +2561,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2621,7 +2635,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2668,7 +2682,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3298,7 +3312,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3596,7 +3610,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = src.val; @@ -3663,7 +3677,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 19 15:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 19 Nov 2014 15: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 1Xr7QY-0001Tc-6e; Wed, 19 Nov 2014 15:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7QW-0001TJ-RU for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F7/4C-23865-0DABC645; Wed, 19 Nov 2014 15:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1416411854!12419929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11993 invoked from network); 19 Nov 2014 15:44: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; 19 Nov 2014 15:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xr7QU-0000ww-2N for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xr7QU-0006F9-07 for xen-changelog@lists.xensource.com; Wed, 19 Nov 2014 15:44:14 +0000 Date: Wed, 19 Nov 2014 15:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d279f6e1344871d71e379cc06c7baa6d4f9f0b29 Author: Jan Beulich AuthorDate: Tue Nov 18 14:28:45 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:28:45 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 1d68c1a70e00ed95ef0889cfa005379dab27b37d master date: 2014-11-18 14:16:23 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5fbe024..25571c6 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1114,7 +1114,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1180,9 +1180,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1247,7 +1261,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1256,7 +1270,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -1888,7 +1902,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2242,7 +2256,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2323,7 +2337,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2547,7 +2561,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2621,7 +2635,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2668,7 +2682,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3298,7 +3312,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3596,7 +3610,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = src.val; @@ -3663,7 +3677,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 23 20:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Nov 2014 20: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 1Xsdfa-0005l0-Pk; Sun, 23 Nov 2014 20:22:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsdfa-0005ku-2P for xen-changelog@lists.xensource.com; Sun, 23 Nov 2014 20:22:06 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id FC/BB-18267-DE142745; Sun, 23 Nov 2014 20:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1416774123!13234753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23659 invoked from network); 23 Nov 2014 20:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2014 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 1XsdfX-0006FL-BX for xen-changelog@lists.xensource.com; Sun, 23 Nov 2014 20:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsdfW-0001sc-RW for xen-changelog@lists.xensource.com; Sun, 23 Nov 2014 20:22:02 +0000 Date: Sun, 23 Nov 2014 20:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 7679aeb444ed3bc4de0f473c16c47eab7d2f9d33 Author: Andrew Cooper AuthorDate: Thu Nov 20 17:43:39 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:43:39 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d1e0346..c086755 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3635,6 +3635,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3654,13 +3660,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 23 20:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 23 Nov 2014 20: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 1Xsdfa-0005l0-Pk; Sun, 23 Nov 2014 20:22:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsdfa-0005ku-2P for xen-changelog@lists.xensource.com; Sun, 23 Nov 2014 20:22:06 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id FC/BB-18267-DE142745; Sun, 23 Nov 2014 20:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1416774123!13234753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23659 invoked from network); 23 Nov 2014 20:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Nov 2014 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 1XsdfX-0006FL-BX for xen-changelog@lists.xensource.com; Sun, 23 Nov 2014 20:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsdfW-0001sc-RW for xen-changelog@lists.xensource.com; Sun, 23 Nov 2014 20:22:02 +0000 Date: Sun, 23 Nov 2014 20:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 7679aeb444ed3bc4de0f473c16c47eab7d2f9d33 Author: Andrew Cooper AuthorDate: Thu Nov 20 17:43:39 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:43:39 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d1e0346..c086755 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3635,6 +3635,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3654,13 +3660,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 04:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XskzW-0006YO-JE; Mon, 24 Nov 2014 04:11:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XskzS-0006YE-7k for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:08 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id C1/CE-26652-9DFA2745; Mon, 24 Nov 2014 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1416802263!12909029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2093 invoked from network); 24 Nov 2014 04: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; 24 Nov 2014 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 1XskzP-00025c-O3 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XskzP-0000Pg-EF for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:03 +0000 Date: Mon, 24 Nov 2014 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't allow page table updates on non-PV page tables in do_mmu_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 e4292c5aac41b80f33d4877104348d5ee7c95aa4 Author: Jan Beulich AuthorDate: Tue Nov 18 14:15:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:15:21 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index edd1923..8ee9938 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3493,6 +3493,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + xsm_needed |= XSM_MMU_NORMAL_UPDATE; if ( get_pte_flags(req.val) & _PAGE_PRESENT ) { -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XskzW-0006YO-JE; Mon, 24 Nov 2014 04:11:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XskzS-0006YE-7k for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:08 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id C1/CE-26652-9DFA2745; Mon, 24 Nov 2014 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1416802263!12909029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2093 invoked from network); 24 Nov 2014 04: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; 24 Nov 2014 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 1XskzP-00025c-O3 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XskzP-0000Pg-EF for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:03 +0000 Date: Mon, 24 Nov 2014 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't allow page table updates on non-PV page tables in do_mmu_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 e4292c5aac41b80f33d4877104348d5ee7c95aa4 Author: Jan Beulich AuthorDate: Tue Nov 18 14:15:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:15:21 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index edd1923..8ee9938 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3493,6 +3493,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + xsm_needed |= XSM_MMU_NORMAL_UPDATE; if ( get_pte_flags(req.val) & _PAGE_PRESENT ) { -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 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 1Xskze-0006Z7-MP; Mon, 24 Nov 2014 04:11:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xskzc-0006Yr-El for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:16 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 89/EA-22819-3EFA2745; Mon, 24 Nov 2014 04:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1416802274!12912365!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23401 invoked from network); 24 Nov 2014 04: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; 24 Nov 2014 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XskzZ-00025f-UP for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XskzZ-0000QA-Sw for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:13 +0000 Date: Mon, 24 Nov 2014 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d68c1a70e00ed95ef0889cfa005379dab27b37d Author: Jan Beulich AuthorDate: Tue Nov 18 14:16:23 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:16:23 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index ffca65a..fef97ea 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1119,7 +1119,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1185,9 +1185,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1252,7 +1266,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1261,7 +1275,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -2003,7 +2017,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2357,7 +2371,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2438,7 +2452,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2662,7 +2676,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2736,7 +2750,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2785,7 +2799,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3415,7 +3429,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3714,7 +3728,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = src.val; @@ -3781,7 +3795,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; 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 24 04:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 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 1Xskze-0006Z7-MP; Mon, 24 Nov 2014 04:11:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xskzc-0006Yr-El for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:16 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 89/EA-22819-3EFA2745; Mon, 24 Nov 2014 04:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1416802274!12912365!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23401 invoked from network); 24 Nov 2014 04: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; 24 Nov 2014 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XskzZ-00025f-UP for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XskzZ-0000QA-Sw for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:13 +0000 Date: Mon, 24 Nov 2014 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d68c1a70e00ed95ef0889cfa005379dab27b37d Author: Jan Beulich AuthorDate: Tue Nov 18 14:16:23 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:16:23 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index ffca65a..fef97ea 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1119,7 +1119,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1185,9 +1185,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1252,7 +1266,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1261,7 +1275,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -2003,7 +2017,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2357,7 +2371,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2438,7 +2452,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2662,7 +2676,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2736,7 +2750,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2785,7 +2799,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3415,7 +3429,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3714,7 +3728,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = src.val; @@ -3781,7 +3795,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; 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 24 04:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xskzo-0006ai-P2; Mon, 24 Nov 2014 04: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 1Xskzm-0006aN-TW for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:27 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 16/E6-02953-EEFA2745; Mon, 24 Nov 2014 04:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1416802284!14335688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18205 invoked from network); 24 Nov 2014 04:11:25 -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; 24 Nov 2014 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 1Xskzk-00025o-2C for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xskzk-0000RF-0i for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:24 +0000 Date: Mon, 24 Nov 2014 04:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Much new material X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d8e5375af9d782ce40c1a2f9914952ffc83c98a Author: Ian Jackson AuthorDate: Wed Nov 5 14:25:03 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:46 2014 +0000 libxl: CODING_STYLE: Much new material Discuss: Memory allocation Conventional variable names Convenience macros Error handling Idempotent data structure construction/destruction Asynchronous/long-running operations Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 169 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 168 insertions(+), 1 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 110a48f..32d058f 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -1,6 +1,173 @@ -Libxenlight Coding Style +LIBXENLIGHT CODING STYLE ======================== + +MEMORY ALLOCATION +----------------- + +Memory allocation for libxl-internal purposes should normally be done +with the provided gc mechanisms; there is then no need to free. See +"libxl memory management" in libxl.h. + + +CONVENTIONAL VARIABLE NAMES +--------------------------- + +The following local variable names should be used where applicable: + + int rc; /* a libxl error code - and not anything else */ + int r; /* the return value from a system call (or libxc call) */ + + uint32_t domid; + libxl__gc *gc; + libxl__egc *egc; + libxl__ao *ao; + + libxl_foo_bar_state *fbs; /* local variable */ + libxl_foo_bar_state foo_bar; /* inside another state struct */ + + +CONVENIENCE MACROS +------------------ + +There are a number of convenience macros which shorten the program and +avoid opportunity for mistakes. In some cases non-use of the macros +produces functional bugs or incorrect error handling. Use the macros +whenever they are applicable. For example: + + Usually, don't use: Instead, use (see libxl_internal.h): + libxl__log[v] LOG, LOGE, LOGEV + libxl__sprintf GCSPRINTF + libxl__*alloc et al. GCNEW, GCNEW_ARRAY, GCREALLOC_ARRAY + malloc et al. GCNEW, GCNEW_ARRAY, GCREALLOC_ARRAY with NOGC + isalnum etc. directly CTYPE + libxl__ctx_[un]lock CTX_LOCK, CTX_UNLOCK + gc=...; ao=...; EGC_GC, AO_GC, STATE_AO_GC + explicit gc creation GC_INIT, GC_FREE + + +ERROR HANDLING +-------------- + +Unless, there are good reasons to do otherwise, the following error +handling and cleanup paradigm should be used: + + * All local variables referring to resources which might need + cleaning up are declared at the top of the function, and + initialised to a sentinel value indicating "nothing allocated". + For example, + libxl_evgen_disk_eject *evg = NULL; + int nullfd = -1; + + * If the function is to return a libxl error value, `rc' is + used to contain the error code, but it is NOT initialised: + int rc; + + * There is only one error cleanup path out of the function. It + starts with a label `out:'. That error cleanup path checks for + each allocated resource and frees it iff necessary. It then + returns rc. For example, + out: + if (evg) libxl__evdisable_disk_eject(gc, evg); + if (nullfd >= 0) close(nullfd); + return rc; + + * Function calls which might fail (ie most function calls) are + handled by putting the return/status value into a variable, and + then checking it in a separate statement: + char *dompath = libxl__xs_get_dompath(gc, bl->domid); + if (!dompath) { rc = ERROR_FAIL; goto out; } + + * If a resource is freed in the main body of the function (for + example, in a loop), the corresponding variable has to be reset to + the sentinel at the point where it's freed. + +Whether to use the `out' path for successful returns as well as error +returns is a matter of taste and convenience for the specific +function. Not reusing the out path is fine if the duplicated function +exit code is only `CTX_UNLOCK; GC_FREE;' (or similar). + +If you reuse the `out' path for successful returns, there may be +resources which are to be returned to the caller rather than freed. +In that case you have to reset the local variable to `nothing here', +to avoid the resource being freed on the out path. That resetting +should be done immediately after the resource value is stored at the +applicable _r function parameter (or equivalent). Do not test `rc' in +the out section, to discover whether to free things. + +The uses of the single-line formatting in the examples above are +permitted exceptions to the usual libxl code formatting rules. + + + +IDEMPOTENT DATA STRUCTURE CONSTRUCTION/DESTRUCTION +-------------------------------------------------- + +Nontrivial data structures (in structs) should come with an idempotent +_dispose function, which must free all resources associated with the +data structure (but not free the struct itself). + +Such a struct should also come with an _init function which +initialises the struct so that _dispose is a no-op. + + +ASYNCHRONOUS/LONG-RUNNING OPERATIONS +------------------------------------ + +All long-running operations in libxl need to use the asynchronous +operation machinery. Consult the programmer documentation in +libxl_internal.h for details - search for "Machinery for asynchronous +operations". + +The code for asynchronous operations should be laid out in +chronological order. That is, where there is a chain of callback +functions, each subsequent function should be, textually, the next +function in the file. This will normally involve predeclaring the +callback functions. Synchronous helper functions should be separated +out into a section preceding the main callback chain. + +Control flow arrangements in asynchronous operations should be made as +simple as possible, because it can otherwise be very hard to see +through the tangle. + + +When inventing a new sub-operation in asynchronous code, consider +whether to structure it formally as a sub-operation with its own state +structure. (See, for example, libxl__datacopier_*.) + +An ao-suboperation state structure should contain, in this order: + * fields that the caller must fill in, and which are, + effectively, the parameters to the operation, including: + - libxl__ao *ao + - the callback function pointer(s), which + should be named callback or callback_*. + * shared information fields or ones used for returning information + to the calling operation + * private fields +These sections should be clearly demarcated by comments. + +An asynchronous operation should normally have an idempotent stop or +cancel function. It should normally also have an _init function for +its state struct, which arranges that the stop is a no-op. + +The permitted order of calls into your ao operation's methods must be +documented in comments, if it is nontrivial. + + +When using an ao sub-operation, you should normally: + * Physically include the sub-operation state struct in your + own state struct; + * Use CONTAINER_OF to find your own state struct at the start of + your implementations of the sub-operation callback functions; + * Unconditionally initialise the sub-operation's struct (with its + _init method) in your own _init method. + * Unconditionally cancel or destroy the sub-operation in your own + cancel or destroy method. + + +FORMATTING AND NAMING +--------------------- + Blatantly copied from qemu and linux with few modifications. -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xskzo-0006ai-P2; Mon, 24 Nov 2014 04: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 1Xskzm-0006aN-TW for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:27 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 16/E6-02953-EEFA2745; Mon, 24 Nov 2014 04:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1416802284!14335688!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18205 invoked from network); 24 Nov 2014 04:11:25 -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; 24 Nov 2014 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 1Xskzk-00025o-2C for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xskzk-0000RF-0i for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:24 +0000 Date: Mon, 24 Nov 2014 04:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Much new material X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d8e5375af9d782ce40c1a2f9914952ffc83c98a Author: Ian Jackson AuthorDate: Wed Nov 5 14:25:03 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:46 2014 +0000 libxl: CODING_STYLE: Much new material Discuss: Memory allocation Conventional variable names Convenience macros Error handling Idempotent data structure construction/destruction Asynchronous/long-running operations Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 169 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 168 insertions(+), 1 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 110a48f..32d058f 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -1,6 +1,173 @@ -Libxenlight Coding Style +LIBXENLIGHT CODING STYLE ======================== + +MEMORY ALLOCATION +----------------- + +Memory allocation for libxl-internal purposes should normally be done +with the provided gc mechanisms; there is then no need to free. See +"libxl memory management" in libxl.h. + + +CONVENTIONAL VARIABLE NAMES +--------------------------- + +The following local variable names should be used where applicable: + + int rc; /* a libxl error code - and not anything else */ + int r; /* the return value from a system call (or libxc call) */ + + uint32_t domid; + libxl__gc *gc; + libxl__egc *egc; + libxl__ao *ao; + + libxl_foo_bar_state *fbs; /* local variable */ + libxl_foo_bar_state foo_bar; /* inside another state struct */ + + +CONVENIENCE MACROS +------------------ + +There are a number of convenience macros which shorten the program and +avoid opportunity for mistakes. In some cases non-use of the macros +produces functional bugs or incorrect error handling. Use the macros +whenever they are applicable. For example: + + Usually, don't use: Instead, use (see libxl_internal.h): + libxl__log[v] LOG, LOGE, LOGEV + libxl__sprintf GCSPRINTF + libxl__*alloc et al. GCNEW, GCNEW_ARRAY, GCREALLOC_ARRAY + malloc et al. GCNEW, GCNEW_ARRAY, GCREALLOC_ARRAY with NOGC + isalnum etc. directly CTYPE + libxl__ctx_[un]lock CTX_LOCK, CTX_UNLOCK + gc=...; ao=...; EGC_GC, AO_GC, STATE_AO_GC + explicit gc creation GC_INIT, GC_FREE + + +ERROR HANDLING +-------------- + +Unless, there are good reasons to do otherwise, the following error +handling and cleanup paradigm should be used: + + * All local variables referring to resources which might need + cleaning up are declared at the top of the function, and + initialised to a sentinel value indicating "nothing allocated". + For example, + libxl_evgen_disk_eject *evg = NULL; + int nullfd = -1; + + * If the function is to return a libxl error value, `rc' is + used to contain the error code, but it is NOT initialised: + int rc; + + * There is only one error cleanup path out of the function. It + starts with a label `out:'. That error cleanup path checks for + each allocated resource and frees it iff necessary. It then + returns rc. For example, + out: + if (evg) libxl__evdisable_disk_eject(gc, evg); + if (nullfd >= 0) close(nullfd); + return rc; + + * Function calls which might fail (ie most function calls) are + handled by putting the return/status value into a variable, and + then checking it in a separate statement: + char *dompath = libxl__xs_get_dompath(gc, bl->domid); + if (!dompath) { rc = ERROR_FAIL; goto out; } + + * If a resource is freed in the main body of the function (for + example, in a loop), the corresponding variable has to be reset to + the sentinel at the point where it's freed. + +Whether to use the `out' path for successful returns as well as error +returns is a matter of taste and convenience for the specific +function. Not reusing the out path is fine if the duplicated function +exit code is only `CTX_UNLOCK; GC_FREE;' (or similar). + +If you reuse the `out' path for successful returns, there may be +resources which are to be returned to the caller rather than freed. +In that case you have to reset the local variable to `nothing here', +to avoid the resource being freed on the out path. That resetting +should be done immediately after the resource value is stored at the +applicable _r function parameter (or equivalent). Do not test `rc' in +the out section, to discover whether to free things. + +The uses of the single-line formatting in the examples above are +permitted exceptions to the usual libxl code formatting rules. + + + +IDEMPOTENT DATA STRUCTURE CONSTRUCTION/DESTRUCTION +-------------------------------------------------- + +Nontrivial data structures (in structs) should come with an idempotent +_dispose function, which must free all resources associated with the +data structure (but not free the struct itself). + +Such a struct should also come with an _init function which +initialises the struct so that _dispose is a no-op. + + +ASYNCHRONOUS/LONG-RUNNING OPERATIONS +------------------------------------ + +All long-running operations in libxl need to use the asynchronous +operation machinery. Consult the programmer documentation in +libxl_internal.h for details - search for "Machinery for asynchronous +operations". + +The code for asynchronous operations should be laid out in +chronological order. That is, where there is a chain of callback +functions, each subsequent function should be, textually, the next +function in the file. This will normally involve predeclaring the +callback functions. Synchronous helper functions should be separated +out into a section preceding the main callback chain. + +Control flow arrangements in asynchronous operations should be made as +simple as possible, because it can otherwise be very hard to see +through the tangle. + + +When inventing a new sub-operation in asynchronous code, consider +whether to structure it formally as a sub-operation with its own state +structure. (See, for example, libxl__datacopier_*.) + +An ao-suboperation state structure should contain, in this order: + * fields that the caller must fill in, and which are, + effectively, the parameters to the operation, including: + - libxl__ao *ao + - the callback function pointer(s), which + should be named callback or callback_*. + * shared information fields or ones used for returning information + to the calling operation + * private fields +These sections should be clearly demarcated by comments. + +An asynchronous operation should normally have an idempotent stop or +cancel function. It should normally also have an _init function for +its state struct, which arranges that the stop is a no-op. + +The permitted order of calls into your ao operation's methods must be +documented in comments, if it is nontrivial. + + +When using an ao sub-operation, you should normally: + * Physically include the sub-operation state struct in your + own state struct; + * Use CONTAINER_OF to find your own state struct at the start of + your implementations of the sub-operation callback functions; + * Unconditionally initialise the sub-operation's struct (with its + _init method) in your own _init method. + * Unconditionally cancel or destroy the sub-operation in your own + cancel or destroy method. + + +FORMATTING AND NAMING +--------------------- + Blatantly copied from qemu and linux with few modifications. -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xskzy-0006cO-S9; Mon, 24 Nov 2014 04: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 1Xskzy-0006cC-Fr for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:38 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id BE/AE-27584-9FFA2745; Mon, 24 Nov 2014 04:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1416802294!12896544!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11719 invoked from network); 24 Nov 2014 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xskzu-00025w-A1 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xskzu-0000Rf-53 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:34 +0000 Date: Mon, 24 Nov 2014 04:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Deprecate `error' for out blocks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b162d7d487f44803df96e6da6bf9bb37f59b276b Author: Ian Jackson AuthorDate: Wed Nov 5 14:26:30 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:52 2014 +0000 libxl: CODING_STYLE: Deprecate `error' for out blocks We should have only one name for this and `out' is more prevalent. Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 32d058f..128cfea 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -239,7 +239,7 @@ variable that is used to hold a temporary value. Local variables used to store return values should have descriptive name like "rc" or "ret". Following the same reasoning the label used as exit -path should be called "out" or "error". +path should be called "out". Variables, type names and function names are lower_case_with_underscores. -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xskzy-0006cO-S9; Mon, 24 Nov 2014 04: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 1Xskzy-0006cC-Fr for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:38 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id BE/AE-27584-9FFA2745; Mon, 24 Nov 2014 04:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1416802294!12896544!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11719 invoked from network); 24 Nov 2014 04:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xskzu-00025w-A1 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xskzu-0000Rf-53 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:34 +0000 Date: Mon, 24 Nov 2014 04:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Deprecate `error' for out blocks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b162d7d487f44803df96e6da6bf9bb37f59b276b Author: Ian Jackson AuthorDate: Wed Nov 5 14:26:30 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:52 2014 +0000 libxl: CODING_STYLE: Deprecate `error' for out blocks We should have only one name for this and `out' is more prevalent. Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 32d058f..128cfea 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -239,7 +239,7 @@ variable that is used to hold a temporary value. Local variables used to store return values should have descriptive name like "rc" or "ret". Following the same reasoning the label used as exit -path should be called "out" or "error". +path should be called "out". Variables, type names and function names are lower_case_with_underscores. -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xsl08-0006fa-Uw; Mon, 24 Nov 2014 04: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 1Xsl07-0006e8-K0 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:47 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D5/B4-23865-200B2745; Mon, 24 Nov 2014 04:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1416802304!13318777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23484 invoked from network); 24 Nov 2014 04:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl04-000262-Ee for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl04-0000S1-DW for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:44 +0000 Date: Mon, 24 Nov 2014 04:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Mention function out parameters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dbdd03d0ad4ad93f1db50341fac56a514c726552 Author: Ian Jackson AuthorDate: Wed Nov 5 14:26:59 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:55 2014 +0000 libxl: CODING_STYLE: Mention function out parameters We seem to use both `_r' and `_out'. Document both. Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 128cfea..9a1d6e0 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -241,6 +241,9 @@ Local variables used to store return values should have descriptive name like "rc" or "ret". Following the same reasoning the label used as exit path should be called "out". +Function arguments which are used to return values to the caller +should be suffixed `_r' or `_out'. + Variables, type names and function names are lower_case_with_underscores. Type names and function names use the prefix libxl__ when internal to -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xsl08-0006fa-Uw; Mon, 24 Nov 2014 04: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 1Xsl07-0006e8-K0 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:47 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id D5/B4-23865-200B2745; Mon, 24 Nov 2014 04:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1416802304!13318777!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23484 invoked from network); 24 Nov 2014 04:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl04-000262-Ee for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl04-0000S1-DW for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:44 +0000 Date: Mon, 24 Nov 2014 04:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Mention function out parameters X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dbdd03d0ad4ad93f1db50341fac56a514c726552 Author: Ian Jackson AuthorDate: Wed Nov 5 14:26:59 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:55 2014 +0000 libxl: CODING_STYLE: Mention function out parameters We seem to use both `_r' and `_out'. Document both. Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 128cfea..9a1d6e0 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -241,6 +241,9 @@ Local variables used to store return values should have descriptive name like "rc" or "ret". Following the same reasoning the label used as exit path should be called "out". +Function arguments which are used to return values to the caller +should be suffixed `_r' or `_out'. + Variables, type names and function names are lower_case_with_underscores. Type names and function names use the prefix libxl__ when internal to -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 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 1Xsl0I-0006ik-59; Mon, 24 Nov 2014 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 1Xsl0G-0006iQ-Q3 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:56 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 1A/E3-09842-C00B2745; Mon, 24 Nov 2014 04:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1416802314!7485024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7949 invoked from network); 24 Nov 2014 04:11:55 -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; 24 Nov 2014 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 1Xsl0E-00026B-Jm for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0E-0000SO-Hz for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:54 +0000 Date: Mon, 24 Nov 2014 04:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Discuss existing style problems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09ff8eadec09233b905f79579900006fb17dd55f Author: Ian Jackson AuthorDate: Wed Nov 5 14:32:47 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:56 2014 +0000 libxl: CODING_STYLE: Discuss existing style problems Document that: - the existing code is not all confirming yet - code should conform - we will sometimes accept patches with nonconforming elements if they don't make matters worse. Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 9a1d6e0..f5b5890 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -2,6 +2,24 @@ LIBXENLIGHT CODING STYLE ======================== +AN APOLOGY AND WARNING +---------------------- + +Much of the code in libxl does not yet follow this coding style +document in every respect. However, new code is expected to conform. + +Patches to improve the style of existing code are welcome. Please +separate these out from functional changes. + +If it is not feasible to conform fully to the style while patching old +code, without doing substantial style reengineering first, we may +accept patches which contain nonconformant elements, provided that +they don't make the coding style problem worse overall. + +In this case, the new code should conform to the prevailing style in +the area being touched. + + MEMORY ALLOCATION ----------------- -- generated by git-patchbot for /home/xen/git/xen.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 24 04:11:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 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 1Xsl0I-0006ik-59; Mon, 24 Nov 2014 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 1Xsl0G-0006iQ-Q3 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:56 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 1A/E3-09842-C00B2745; Mon, 24 Nov 2014 04:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1416802314!7485024!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7949 invoked from network); 24 Nov 2014 04:11:55 -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; 24 Nov 2014 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 1Xsl0E-00026B-Jm for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0E-0000SO-Hz for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:11:54 +0000 Date: Mon, 24 Nov 2014 04:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: CODING_STYLE: Discuss existing style problems X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09ff8eadec09233b905f79579900006fb17dd55f Author: Ian Jackson AuthorDate: Wed Nov 5 14:32:47 2014 +0000 Commit: Ian Jackson CommitDate: Tue Nov 18 14:51:56 2014 +0000 libxl: CODING_STYLE: Discuss existing style problems Document that: - the existing code is not all confirming yet - code should conform - we will sometimes accept patches with nonconforming elements if they don't make matters worse. Signed-off-by: Ian Jackson Acked-by: Wei Liu Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/CODING_STYLE | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 9a1d6e0..f5b5890 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -2,6 +2,24 @@ LIBXENLIGHT CODING STYLE ======================== +AN APOLOGY AND WARNING +---------------------- + +Much of the code in libxl does not yet follow this coding style +document in every respect. However, new code is expected to conform. + +Patches to improve the style of existing code are welcome. Please +separate these out from functional changes. + +If it is not feasible to conform fully to the style while patching old +code, without doing substantial style reengineering first, we may +accept patches which contain nonconformant elements, provided that +they don't make the coding style problem worse overall. + +In this case, the new code should conform to the prevailing style in +the area being touched. + + MEMORY ALLOCATION ----------------- -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0U-0006k7-8L; Mon, 24 Nov 2014 04: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 1Xsl0S-0006jc-Tp for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:09 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 9E/AE-07724-810B2745; Mon, 24 Nov 2014 04:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1416802324!13362966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31035 invoked from network); 24 Nov 2014 04:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl0O-00026k-PD for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0O-0000Su-NO for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:04 +0000 Date: Mon, 24 Nov 2014 04:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove existence check for PCI device hotplug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b923a13761eaf9b2b9689b0ce57dd1be55458274 Author: Wei Liu AuthorDate: Mon Nov 17 12:10:34 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:25:33 2014 +0000 libxl: remove existence check for PCI device hotplug The existence check is to make sure a device is not added to a guest multiple times. PCI device backend path has different rules from vif, disk etc. For example: /local/domain/0/backend/pci/9/0/dev-1/0000:03:10.1 /local/domain/0/backend/pci/9/0/key-1/0000:03:10.1 /local/domain/0/backend/pci/9/0/dev-2/0000:03:10.2 /local/domain/0/backend/pci/9/0/key-2/0000:03:10.2 The devid for PCI devices is hardcoded 0. libxl__device_exists only checks up to /local/.../9/0 so it always returns true even the device is assignable. Remove invocation of libxl__device_exists. We're sure at this point that the PCI device is assignable (hence no xenstore entry or JSON entry). The check is done before hand. For HVM guest it's done by calling xc_test_assign_device and for PV guest it's done by calling pciback_dev_is_assigned. Reported-by: Li, Liang Z Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Konrad Wilk Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9f40100..316643c 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -175,14 +175,6 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; - rc = libxl__device_exists(gc, t, device); - if (rc < 0) goto out; - if (rc == 1) { - LOG(ERROR, "device already exists in xenstore"); - rc = ERROR_DEVICE_EXISTS; - goto out; - } - rc = libxl__set_domain_configuration(gc, domid, &d_config); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 04:12:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0U-0006k7-8L; Mon, 24 Nov 2014 04: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 1Xsl0S-0006jc-Tp for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:09 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 9E/AE-07724-810B2745; Mon, 24 Nov 2014 04:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1416802324!13362966!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31035 invoked from network); 24 Nov 2014 04:12:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl0O-00026k-PD for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0O-0000Su-NO for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:04 +0000 Date: Mon, 24 Nov 2014 04:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: remove existence check for PCI device hotplug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b923a13761eaf9b2b9689b0ce57dd1be55458274 Author: Wei Liu AuthorDate: Mon Nov 17 12:10:34 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:25:33 2014 +0000 libxl: remove existence check for PCI device hotplug The existence check is to make sure a device is not added to a guest multiple times. PCI device backend path has different rules from vif, disk etc. For example: /local/domain/0/backend/pci/9/0/dev-1/0000:03:10.1 /local/domain/0/backend/pci/9/0/key-1/0000:03:10.1 /local/domain/0/backend/pci/9/0/dev-2/0000:03:10.2 /local/domain/0/backend/pci/9/0/key-2/0000:03:10.2 The devid for PCI devices is hardcoded 0. libxl__device_exists only checks up to /local/.../9/0 so it always returns true even the device is assignable. Remove invocation of libxl__device_exists. We're sure at this point that the PCI device is assignable (hence no xenstore entry or JSON entry). The check is done before hand. For HVM guest it's done by calling xc_test_assign_device and for PV guest it's done by calling pciback_dev_is_assigned. Reported-by: Li, Liang Z Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Konrad Wilk Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 9f40100..316643c 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -175,14 +175,6 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; - rc = libxl__device_exists(gc, t, device); - if (rc < 0) goto out; - if (rc == 1) { - LOG(ERROR, "device already exists in xenstore"); - rc = ERROR_DEVICE_EXISTS; - goto out; - } - rc = libxl__set_domain_configuration(gc, domid, &d_config); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 04:12:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xsl0c-0006lc-Av; Mon, 24 Nov 2014 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 1Xsl0b-0006lR-Hj for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:17 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 60/4E-27785-020B2745; Mon, 24 Nov 2014 04:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1416802335!14312787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21868 invoked from network); 24 Nov 2014 04:12:16 -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; 24 Nov 2014 04:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0Z-00026q-0h for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0Y-0000TR-Tb for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:14 +0000 Date: Mon, 24 Nov 2014 04:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Document device parameter of libxl_device__add 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 405254bbb2fdbfa8a428fd144ea7585812af9e8a Author: Euan Harris AuthorDate: Tue Nov 18 17:07:41 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:31:50 2014 +0000 libxl: Document device parameter of libxl_device__add functions The device parameter of libxl_device__add is an in/out parameter. Unspecified fields are filled in with appropriate values for the created device when the function returns. Document this behaviour. Signed-off-by: Euan Harris Acked-by: Ian Jackson --- tools/libxl/libxl.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c3451bd..41d6e8d 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1109,6 +1109,10 @@ void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); * domain to connect to the device and therefore cannot block on the * guest. * + * device is an in/out parameter: fields left unspecified when the + * structure is passed in are filled in with appropriate values for + * the device created. + * * libxl_device__remove(ctx, domid, device): * * Removes the given device from the specified domain by performing -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xsl0c-0006lc-Av; Mon, 24 Nov 2014 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 1Xsl0b-0006lR-Hj for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:17 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 60/4E-27785-020B2745; Mon, 24 Nov 2014 04:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1416802335!14312787!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21868 invoked from network); 24 Nov 2014 04:12:16 -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; 24 Nov 2014 04:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0Z-00026q-0h for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0Y-0000TR-Tb for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:14 +0000 Date: Mon, 24 Nov 2014 04:12:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Document device parameter of libxl_device__add 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 405254bbb2fdbfa8a428fd144ea7585812af9e8a Author: Euan Harris AuthorDate: Tue Nov 18 17:07:41 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:31:50 2014 +0000 libxl: Document device parameter of libxl_device__add functions The device parameter of libxl_device__add is an in/out parameter. Unspecified fields are filled in with appropriate values for the created device when the function returns. Document this behaviour. Signed-off-by: Euan Harris Acked-by: Ian Jackson --- tools/libxl/libxl.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index c3451bd..41d6e8d 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1109,6 +1109,10 @@ void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); * domain to connect to the device and therefore cannot block on the * guest. * + * device is an in/out parameter: fields left unspecified when the + * structure is passed in are filled in with appropriate values for + * the device created. + * * libxl_device__remove(ctx, domid, device): * * Removes the given device from the specified domain by performing -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12: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 1Xsl0n-0006ni-Dt; Mon, 24 Nov 2014 04:12:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0l-0006nJ-Rt for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:27 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 9A/F1-11581-A20B2745; Mon, 24 Nov 2014 04:12:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1416802345!12916723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 806 invoked from network); 24 Nov 2014 04:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl0j-00026w-6H for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0j-0000UJ-51 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:25 +0000 Date: Mon, 24 Nov 2014 04:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mkdeb: correctly map package architectures for x86 and 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 4de0025bf45fbf26f9cb6661d23d2d16ec87bb47 Author: Clark Laughlin AuthorDate: Wed Nov 12 09:38:48 2014 -0600 Commit: Ian Campbell CommitDate: Thu Nov 20 15:34:53 2014 +0000 mkdeb: correctly map package architectures for x86 and ARM mkdeb previously set the package architecture to be 'amd64' for anything other than XEN_TARGET_ARCH=x86_32. This patch attempts to correctly map the architecture from XEN_TARGET_ARCH to the Debian architecture names for x86 and ARM architectures. Signed-off-by: Clark Laughlin Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/misc/mkdeb | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/misc/mkdeb b/tools/misc/mkdeb index 3bbf881..67b91cc 100644 --- a/tools/misc/mkdeb +++ b/tools/misc/mkdeb @@ -13,11 +13,17 @@ fi cd $1 version=$2 -if test "$XEN_TARGET_ARCH" = "x86_32"; then - arch=i386 -else - arch=amd64 -fi + +# map the architecture, if necessary +case "$XEN_TARGET_ARCH" in + x86_32|x86_32p) arch=i386 ;; + x86_64) arch=amd64 ;; + arm32) arch=armhf ;; + arm64) arch=$XEN_TARGET_ARCH;; + *) echo "Unknown XEN_TARGET_ARCH $XEN_TARGET_ARCH" >&2 + exit 1 + ;; +esac # Prepare the directory to package cd dist -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12: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 1Xsl0n-0006ni-Dt; Mon, 24 Nov 2014 04:12:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0l-0006nJ-Rt for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:27 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 9A/F1-11581-A20B2745; Mon, 24 Nov 2014 04:12:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1416802345!12916723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 806 invoked from network); 24 Nov 2014 04:12:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl0j-00026w-6H for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0j-0000UJ-51 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:25 +0000 Date: Mon, 24 Nov 2014 04:12:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mkdeb: correctly map package architectures for x86 and 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 4de0025bf45fbf26f9cb6661d23d2d16ec87bb47 Author: Clark Laughlin AuthorDate: Wed Nov 12 09:38:48 2014 -0600 Commit: Ian Campbell CommitDate: Thu Nov 20 15:34:53 2014 +0000 mkdeb: correctly map package architectures for x86 and ARM mkdeb previously set the package architecture to be 'amd64' for anything other than XEN_TARGET_ARCH=x86_32. This patch attempts to correctly map the architecture from XEN_TARGET_ARCH to the Debian architecture names for x86 and ARM architectures. Signed-off-by: Clark Laughlin Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- tools/misc/mkdeb | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/misc/mkdeb b/tools/misc/mkdeb index 3bbf881..67b91cc 100644 --- a/tools/misc/mkdeb +++ b/tools/misc/mkdeb @@ -13,11 +13,17 @@ fi cd $1 version=$2 -if test "$XEN_TARGET_ARCH" = "x86_32"; then - arch=i386 -else - arch=amd64 -fi + +# map the architecture, if necessary +case "$XEN_TARGET_ARCH" in + x86_32|x86_32p) arch=i386 ;; + x86_64) arch=amd64 ;; + arm32) arch=armhf ;; + arm64) arch=$XEN_TARGET_ARCH;; + *) echo "Unknown XEN_TARGET_ARCH $XEN_TARGET_ARCH" >&2 + exit 1 + ;; +esac # Prepare the directory to package cd dist -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12: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 1Xsl0w-0006pE-H4; Mon, 24 Nov 2014 04:12:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0v-0006p0-Mf for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:37 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 6B/26-02954-530B2745; Mon, 24 Nov 2014 04:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1416802355!14314752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16389 invoked from network); 24 Nov 2014 04:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl0t-000274-AM for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0t-0000Uj-9K for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:35 +0000 Date: Mon, 24 Nov 2014 04:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae325e94d2076f3953824e069c062908221f7325 Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:36:54 2014 +0000 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 0830e5f..b7eaeea 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -247,19 +247,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12: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 1Xsl0w-0006pE-H4; Mon, 24 Nov 2014 04:12:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl0v-0006p0-Mf for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:37 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 6B/26-02954-530B2745; Mon, 24 Nov 2014 04:12:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1416802355!14314752!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16389 invoked from network); 24 Nov 2014 04:12:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl0t-000274-AM for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl0t-0000Uj-9K for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:35 +0000 Date: Mon, 24 Nov 2014 04:12:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: workaround markdown parser error in xen-command-line.markdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae325e94d2076f3953824e069c062908221f7325 Author: Ian Campbell AuthorDate: Wed Nov 19 10:42:18 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:36:54 2014 +0000 docs: workaround markdown parser error in xen-command-line.markdown Some versions of markdown (specifically the one in Debian Wheezy, currently used to generate http://xenbits.xen.org/docs/unstable/misc/xen-command-line.html) seem to be confused by nested lists in the middle of multi-paragraph parent list entries as seen in the com1,com2 entry. The effect is that the "Default" section of all following entries are replace by some sort of hash or checksum (at least, a string of 32 random seeming hex digits). Workaround this issue by making the decriptions of the DPS options a nested list, moving the existing nested list describing the options for S into a third level list. This seems to avoid the issue, and is arguably better formatting in its own right (at least its not a regression IMHO) Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 21 ++++++++------------- 1 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 0830e5f..b7eaeea 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -247,19 +247,14 @@ Both option `com1` and `com2` follow the same format. * Optionally, a clock speed measured in hz can be specified. * `DPS` represents the number of data bits, the parity, and the number of stop bits. - - `D` is an integer between 5 and 8 for the number of data bits. - - `P` is a single character representing the type of parity: - - * `n` No - * `o` Odd - * `e` Even - * `m` Mark - * `s` Space - - `S` is an integer 1 or 2 for the number of stop bits. - + * `D` is an integer between 5 and 8 for the number of data bits. + * `P` is a single character representing the type of parity: + * `n` No + * `o` Odd + * `e` Even + * `m` Mark + * `s` Space + * `S` is an integer 1 or 2 for the number of stop bits. * `` is an integer which specifies the IO base port for UART registers. * `` is the IRQ number to use, or `0` to use the UART in poll -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12: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 1Xsl17-0006qu-K9; Mon, 24 Nov 2014 04:12:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl15-0006qa-PC for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:47 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id D4/F2-16982-F30B2745; Mon, 24 Nov 2014 04:12:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1416802365!9581802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21752 invoked from network); 24 Nov 2014 04:12:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl13-00027A-Dz for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl13-0000V5-Cp for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:45 +0000 Date: Mon, 24 Nov 2014 04:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add earlyprintk for McDivitt. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3961cbea5846b0a054226b3d0adf1cada71d307 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:11 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:19 2014 +0000 xen: arm: Add earlyprintk for McDivitt. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 572d854..30c7823 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -95,6 +95,11 @@ EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x1c020000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), xgene-mcdivitt) +EARLY_PRINTK_INC := 8250 +EARLY_UART_BASE_ADDRESS := 0x1c021000 +EARLY_UART_REG_SHIFT := 2 +endif ifeq ($(CONFIG_EARLY_PRINTK), juno) EARLY_PRINTK_INC := pl011 EARLY_PRINTK_BAUD := 115200 -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:12: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 1Xsl17-0006qu-K9; Mon, 24 Nov 2014 04:12:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl15-0006qa-PC for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:47 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id D4/F2-16982-F30B2745; Mon, 24 Nov 2014 04:12:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1416802365!9581802!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21752 invoked from network); 24 Nov 2014 04:12:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 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 1Xsl13-00027A-Dz for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl13-0000V5-Cp for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:45 +0000 Date: Mon, 24 Nov 2014 04:12:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Add earlyprintk for McDivitt. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3961cbea5846b0a054226b3d0adf1cada71d307 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:11 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:19 2014 +0000 xen: arm: Add earlyprintk for McDivitt. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/Rules.mk | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 572d854..30c7823 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -95,6 +95,11 @@ EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x1c020000 EARLY_UART_REG_SHIFT := 2 endif +ifeq ($(CONFIG_EARLY_PRINTK), xgene-mcdivitt) +EARLY_PRINTK_INC := 8250 +EARLY_UART_BASE_ADDRESS := 0x1c021000 +EARLY_UART_REG_SHIFT := 2 +endif ifeq ($(CONFIG_EARLY_PRINTK), juno) EARLY_PRINTK_INC := pl011 EARLY_PRINTK_BAUD := 115200 -- generated by git-patchbot for /home/xen/git/xen.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 24 04:12:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 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 1Xsl1H-0006sY-Mu; Mon, 24 Nov 2014 04:12:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1G-0006sF-6P for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:58 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id AA/C8-27623-940B2745; Mon, 24 Nov 2014 04:12:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1416802375!10861982!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.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9961 invoked from network); 24 Nov 2014 04:12:56 -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; 24 Nov 2014 04:12:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1D-00027J-JU for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1D-0000VR-I1 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:55 +0000 Date: Mon, 24 Nov 2014 04:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Drop EARLY_PRINTK_BAUD from entries which don't set ..._INIT_UART X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38ce10818f00b419a92fbe6cce9141447c1f2139 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:12 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:33 2014 +0000 xen: arm: Drop EARLY_PRINTK_BAUD from entries which don't set ..._INIT_UART EARLY_PRINTK_BAUD doesn't do anything unless EARLY_PRINTK_INIT_UART is set. Furthermore only the pl011 driver implements the init routine at all, so the entries which use any other UART driver and specified a BAUD were doubly wrong. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/Rules.mk | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 30c7823..4ee51a9 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -45,7 +45,6 @@ ifeq ($(debug),y) # Early printk for versatile express ifeq ($(CONFIG_EARLY_PRINTK), vexpress) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 38400 EARLY_UART_BASE_ADDRESS := 0x1c090000 endif ifeq ($(CONFIG_EARLY_PRINTK), fastmodel) @@ -56,12 +55,10 @@ EARLY_UART_BASE_ADDRESS := 0x1c090000 endif ifeq ($(CONFIG_EARLY_PRINTK), exynos5250) EARLY_PRINTK_INC := exynos4210 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x12c20000 endif ifeq ($(CONFIG_EARLY_PRINTK), midway) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0xfff36000 endif ifeq ($(CONFIG_EARLY_PRINTK), omap5432) @@ -91,7 +88,6 @@ EARLY_UART_REG_SHIFT := 2 endif ifeq ($(CONFIG_EARLY_PRINTK), xgene-storm) EARLY_PRINTK_INC := 8250 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x1c020000 EARLY_UART_REG_SHIFT := 2 endif @@ -102,18 +98,15 @@ EARLY_UART_REG_SHIFT := 2 endif ifeq ($(CONFIG_EARLY_PRINTK), juno) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x7ff80000 endif ifeq ($(CONFIG_EARLY_PRINTK), hip04-d01) EARLY_PRINTK_INC := 8250 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0xE4007000 EARLY_UART_REG_SHIFT := 2 endif ifeq ($(CONFIG_EARLY_PRINTK), seattle) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0xe1010000 endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 04:12:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 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 1Xsl1H-0006sY-Mu; Mon, 24 Nov 2014 04:12:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1G-0006sF-6P for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:58 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id AA/C8-27623-940B2745; Mon, 24 Nov 2014 04:12:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1416802375!10861982!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.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9961 invoked from network); 24 Nov 2014 04:12:56 -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; 24 Nov 2014 04:12:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1D-00027J-JU for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1D-0000VR-I1 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:12:55 +0000 Date: Mon, 24 Nov 2014 04:12:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Drop EARLY_PRINTK_BAUD from entries which don't set ..._INIT_UART X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 38ce10818f00b419a92fbe6cce9141447c1f2139 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:12 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:33 2014 +0000 xen: arm: Drop EARLY_PRINTK_BAUD from entries which don't set ..._INIT_UART EARLY_PRINTK_BAUD doesn't do anything unless EARLY_PRINTK_INIT_UART is set. Furthermore only the pl011 driver implements the init routine at all, so the entries which use any other UART driver and specified a BAUD were doubly wrong. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/Rules.mk | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 30c7823..4ee51a9 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -45,7 +45,6 @@ ifeq ($(debug),y) # Early printk for versatile express ifeq ($(CONFIG_EARLY_PRINTK), vexpress) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 38400 EARLY_UART_BASE_ADDRESS := 0x1c090000 endif ifeq ($(CONFIG_EARLY_PRINTK), fastmodel) @@ -56,12 +55,10 @@ EARLY_UART_BASE_ADDRESS := 0x1c090000 endif ifeq ($(CONFIG_EARLY_PRINTK), exynos5250) EARLY_PRINTK_INC := exynos4210 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x12c20000 endif ifeq ($(CONFIG_EARLY_PRINTK), midway) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0xfff36000 endif ifeq ($(CONFIG_EARLY_PRINTK), omap5432) @@ -91,7 +88,6 @@ EARLY_UART_REG_SHIFT := 2 endif ifeq ($(CONFIG_EARLY_PRINTK), xgene-storm) EARLY_PRINTK_INC := 8250 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x1c020000 EARLY_UART_REG_SHIFT := 2 endif @@ -102,18 +98,15 @@ EARLY_UART_REG_SHIFT := 2 endif ifeq ($(CONFIG_EARLY_PRINTK), juno) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0x7ff80000 endif ifeq ($(CONFIG_EARLY_PRINTK), hip04-d01) EARLY_PRINTK_INC := 8250 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0xE4007000 EARLY_UART_REG_SHIFT := 2 endif ifeq ($(CONFIG_EARLY_PRINTK), seattle) EARLY_PRINTK_INC := pl011 -EARLY_PRINTK_BAUD := 115200 EARLY_UART_BASE_ADDRESS := 0xe1010000 endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 04:13:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:13: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 1Xsl1V-0006u9-Pg; Mon, 24 Nov 2014 04:13:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1T-0006tk-SV for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:12 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 6A/28-18267-750B2745; Mon, 24 Nov 2014 04:13:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1416802385!13353531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12903 invoked from network); 24 Nov 2014 04:13:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 04:13:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1N-00027s-Og for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1N-0000W1-Mh for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:05 +0000 Date: Mon, 24 Nov 2014 04:13:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct off by one in xgene-storm's map_one_mmio X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f25d1b324b7922094c9e1bde78d7df01d57dadc Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:13 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:48 2014 +0000 xen: arm: correct off by one in xgene-storm's map_one_mmio The callers pass the end as the pfn immediately *after* the last page to be mapped, therefore adding one is incorrect and causes an additional page to be mapped. At the same time correct the printing of the mfn values, zero-padding them to 16 digits as for a paddr when they are frame numbers is just confusing. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/xgene-storm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 29c4752..8685c93 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -45,11 +45,11 @@ static int map_one_mmio(struct domain *d, const char *what, { int ret; - printk("Additional MMIO %"PRIpaddr"-%"PRIpaddr" (%s)\n", + printk("Additional MMIO %lx-%lx (%s)\n", start, end, what); - ret = map_mmio_regions(d, start, end - start + 1, start); + ret = map_mmio_regions(d, start, end - start, start); if ( ret ) - printk("Failed to map %s @ %"PRIpaddr" to dom%d\n", + printk("Failed to map %s @ %lx to dom%d\n", what, start, d->domain_id); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 04:13:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:13: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 1Xsl1V-0006u9-Pg; Mon, 24 Nov 2014 04:13:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1T-0006tk-SV for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:12 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 6A/28-18267-750B2745; Mon, 24 Nov 2014 04:13:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1416802385!13353531!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12903 invoked from network); 24 Nov 2014 04:13:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 04:13:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1N-00027s-Og for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1N-0000W1-Mh for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:05 +0000 Date: Mon, 24 Nov 2014 04:13:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct off by one in xgene-storm's map_one_mmio X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f25d1b324b7922094c9e1bde78d7df01d57dadc Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:13 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:48 2014 +0000 xen: arm: correct off by one in xgene-storm's map_one_mmio The callers pass the end as the pfn immediately *after* the last page to be mapped, therefore adding one is incorrect and causes an additional page to be mapped. At the same time correct the printing of the mfn values, zero-padding them to 16 digits as for a paddr when they are frame numbers is just confusing. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/xgene-storm.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 29c4752..8685c93 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -45,11 +45,11 @@ static int map_one_mmio(struct domain *d, const char *what, { int ret; - printk("Additional MMIO %"PRIpaddr"-%"PRIpaddr" (%s)\n", + printk("Additional MMIO %lx-%lx (%s)\n", start, end, what); - ret = map_mmio_regions(d, start, end - start + 1, start); + ret = map_mmio_regions(d, start, end - start, start); if ( ret ) - printk("Failed to map %s @ %"PRIpaddr" to dom%d\n", + printk("Failed to map %s @ %lx to dom%d\n", what, start, d->domain_id); return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 04:13:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:13: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 1Xsl1b-0006vX-VE; Mon, 24 Nov 2014 04: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 1Xsl1a-0006vG-Bv for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:18 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id B2/84-09842-D50B2745; Mon, 24 Nov 2014 04:13:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1416802396!7485126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11369 invoked from network); 24 Nov 2014 04:13:17 -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; 24 Nov 2014 04:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1Y-00027w-2G for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1X-0000WR-SK for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:16 +0000 Date: Mon, 24 Nov 2014 04:13:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct specific mappings for PCIE0 on X-Gene X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e1d1d097423aaeb2fb2f19ac4691bb326bd62d8 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:59 2014 +0000 xen: arm: correct specific mappings for PCIE0 on X-Gene The region assigned to PCIE0, according to the docs, is 0x0e000000000 to 0x10000000000. They make no distinction between PCI CFG and PCI IO mem within this range (in fact, I'm not sure that isn't up to the driver). Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/xgene-storm.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 8685c93..8c27f24 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -89,22 +89,8 @@ static int xgene_storm_specific_mapping(struct domain *d) int ret; /* Map the PCIe bus resources */ - ret = map_one_mmio(d, "PCI MEM REGION", paddr_to_pfn(0xe000000000UL), - paddr_to_pfn(0xe010000000UL)); - if ( ret ) - goto err; - - ret = map_one_mmio(d, "PCI IO REGION", paddr_to_pfn(0xe080000000UL), - paddr_to_pfn(0xe080010000UL)); - if ( ret ) - goto err; - - ret = map_one_mmio(d, "PCI CFG REGION", paddr_to_pfn(0xe0d0000000UL), - paddr_to_pfn(0xe0d0200000UL)); - if ( ret ) - goto err; - ret = map_one_mmio(d, "PCI MSI REGION", paddr_to_pfn(0xe010000000UL), - paddr_to_pfn(0xe010800000UL)); + ret = map_one_mmio(d, "PCI MEMORY", paddr_to_pfn(0x0e000000000UL), + paddr_to_pfn(0x01000000000UL)); if ( ret ) 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 Mon Nov 24 04:13:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:13: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 1Xsl1b-0006vX-VE; Mon, 24 Nov 2014 04: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 1Xsl1a-0006vG-Bv for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:18 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id B2/84-09842-D50B2745; Mon, 24 Nov 2014 04:13:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1416802396!7485126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11369 invoked from network); 24 Nov 2014 04:13:17 -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; 24 Nov 2014 04:13:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1Y-00027w-2G for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1X-0000WR-SK for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:16 +0000 Date: Mon, 24 Nov 2014 04:13:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: correct specific mappings for PCIE0 on X-Gene X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4e1d1d097423aaeb2fb2f19ac4691bb326bd62d8 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:14 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:38:59 2014 +0000 xen: arm: correct specific mappings for PCIE0 on X-Gene The region assigned to PCIE0, according to the docs, is 0x0e000000000 to 0x10000000000. They make no distinction between PCI CFG and PCI IO mem within this range (in fact, I'm not sure that isn't up to the driver). Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/xgene-storm.c | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 8685c93..8c27f24 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -89,22 +89,8 @@ static int xgene_storm_specific_mapping(struct domain *d) int ret; /* Map the PCIe bus resources */ - ret = map_one_mmio(d, "PCI MEM REGION", paddr_to_pfn(0xe000000000UL), - paddr_to_pfn(0xe010000000UL)); - if ( ret ) - goto err; - - ret = map_one_mmio(d, "PCI IO REGION", paddr_to_pfn(0xe080000000UL), - paddr_to_pfn(0xe080010000UL)); - if ( ret ) - goto err; - - ret = map_one_mmio(d, "PCI CFG REGION", paddr_to_pfn(0xe0d0000000UL), - paddr_to_pfn(0xe0d0200000UL)); - if ( ret ) - goto err; - ret = map_one_mmio(d, "PCI MSI REGION", paddr_to_pfn(0xe010000000UL), - paddr_to_pfn(0xe010800000UL)); + ret = map_one_mmio(d, "PCI MEMORY", paddr_to_pfn(0x0e000000000UL), + paddr_to_pfn(0x01000000000UL)); if ( ret ) 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 Mon Nov 24 04:13:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:13: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 1Xsl1m-0006xa-1r; Mon, 24 Nov 2014 04:13:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1k-0006xJ-K4 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:28 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 54/97-02953-760B2745; Mon, 24 Nov 2014 04:13:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1416802406!14312895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24813 invoked from network); 24 Nov 2014 04:13:27 -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; 24 Nov 2014 04:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1i-000284-72 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1i-0000Y6-5o for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:26 +0000 Date: Mon, 24 Nov 2014 04:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/commandline: Fix formatting issues X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4413affc5fd5d36286d82f815eb9d3084ae5c21a Author: Andrew Cooper AuthorDate: Thu Nov 20 15:22:00 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:40:54 2014 +0000 docs/commandline: Fix formatting issues For 'dom0_max_vcpus' and 'hvm_debug', markdown was interpreting the text as regular text, and reflowing it as a regular paragraph, leading to a single line as output. Reformat them as code blocks inside blockquote blocks, which causes them to take their precise whitespace layout. For 'psr', the bullet point was incorrectly delineated from paragraph text, causing it to be reflowed. Alter the formatting to include the CMT-specific options as sub-bullets of the overall CMT resource. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Release-acked-by: Konrad Rzeszutek Wilk CC: Ian Jackson CC: Wei Liu --- docs/misc/xen-command-line.markdown | 47 +++++++++++++++++------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index b7eaeea..2b7d29c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -475,13 +475,13 @@ defaults of 1 and unlimited respectively are used instead. For example, with `dom0_max_vcpus=4-8`: - Number of - PCPUs | Dom0 VCPUs - 2 | 4 - 4 | 4 - 6 | 6 - 8 | 8 - 10 | 8 +> Number of +> PCPUs | Dom0 VCPUs +> 2 | 4 +> 4 | 4 +> 6 | 6 +> 8 | 8 +> 10 | 8 ### dom0\_mem > `= List of ( min: | max: | )` @@ -684,18 +684,18 @@ supported only when compiled with XSM\_ENABLE=y on x86. The specified value is a bit mask with the individual bits having the following meaning: -Bit 0 - debug level 0 (unused at present) -Bit 1 - debug level 1 (Control Register logging) -Bit 2 - debug level 2 (VMX logging of MSR restores when context switching) -Bit 3 - debug level 3 (unused at present) -Bit 4 - I/O operation logging -Bit 5 - vMMU logging -Bit 6 - vLAPIC general logging -Bit 7 - vLAPIC timer logging -Bit 8 - vLAPIC interrupt logging -Bit 9 - vIOAPIC logging -Bit 10 - hypercall logging -Bit 11 - MSR operation logging +> Bit 0 - debug level 0 (unused at present) +> Bit 1 - debug level 1 (Control Register logging) +> Bit 2 - debug level 2 (VMX logging of MSR restores when context switching) +> Bit 3 - debug level 3 (unused at present) +> Bit 4 - I/O operation logging +> Bit 5 - vMMU logging +> Bit 6 - vLAPIC general logging +> Bit 7 - vLAPIC timer logging +> Bit 8 - vLAPIC interrupt logging +> Bit 9 - vIOAPIC logging +> Bit 10 - hypercall logging +> Bit 11 - MSR operation logging Recognized in debug builds of the hypervisor only. @@ -1047,12 +1047,11 @@ resource. RMID is a hardware-provided layer of abstraction between software and logical processors. The following resources are available: -* Cache Monitoring Technology (Haswell and later). Information -regarding the L3 cache occupancy. -`cmt` instructs Xen to enable/disable Cache Monitoring Technology. - -`rmid_max` indicates the max value for rmid. +* Cache Monitoring Technology (Haswell and later). Information regarding the + L3 cache occupancy. + * `cmt` instructs Xen to enable/disable Cache Monitoring Technology. + * `rmid_max` indicates the max value for rmid. ### reboot > `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` -- generated by git-patchbot for /home/xen/git/xen.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 24 04:13:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04:13: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 1Xsl1m-0006xa-1r; Mon, 24 Nov 2014 04:13:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1k-0006xJ-K4 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:28 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 54/97-02953-760B2745; Mon, 24 Nov 2014 04:13:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1416802406!14312895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24813 invoked from network); 24 Nov 2014 04:13:27 -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; 24 Nov 2014 04:13:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1i-000284-72 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1i-0000Y6-5o for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:26 +0000 Date: Mon, 24 Nov 2014 04:13:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/commandline: Fix formatting issues X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4413affc5fd5d36286d82f815eb9d3084ae5c21a Author: Andrew Cooper AuthorDate: Thu Nov 20 15:22:00 2014 +0000 Commit: Ian Campbell CommitDate: Thu Nov 20 15:40:54 2014 +0000 docs/commandline: Fix formatting issues For 'dom0_max_vcpus' and 'hvm_debug', markdown was interpreting the text as regular text, and reflowing it as a regular paragraph, leading to a single line as output. Reformat them as code blocks inside blockquote blocks, which causes them to take their precise whitespace layout. For 'psr', the bullet point was incorrectly delineated from paragraph text, causing it to be reflowed. Alter the formatting to include the CMT-specific options as sub-bullets of the overall CMT resource. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell Release-acked-by: Konrad Rzeszutek Wilk CC: Ian Jackson CC: Wei Liu --- docs/misc/xen-command-line.markdown | 47 +++++++++++++++++------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index b7eaeea..2b7d29c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -475,13 +475,13 @@ defaults of 1 and unlimited respectively are used instead. For example, with `dom0_max_vcpus=4-8`: - Number of - PCPUs | Dom0 VCPUs - 2 | 4 - 4 | 4 - 6 | 6 - 8 | 8 - 10 | 8 +> Number of +> PCPUs | Dom0 VCPUs +> 2 | 4 +> 4 | 4 +> 6 | 6 +> 8 | 8 +> 10 | 8 ### dom0\_mem > `= List of ( min: | max: | )` @@ -684,18 +684,18 @@ supported only when compiled with XSM\_ENABLE=y on x86. The specified value is a bit mask with the individual bits having the following meaning: -Bit 0 - debug level 0 (unused at present) -Bit 1 - debug level 1 (Control Register logging) -Bit 2 - debug level 2 (VMX logging of MSR restores when context switching) -Bit 3 - debug level 3 (unused at present) -Bit 4 - I/O operation logging -Bit 5 - vMMU logging -Bit 6 - vLAPIC general logging -Bit 7 - vLAPIC timer logging -Bit 8 - vLAPIC interrupt logging -Bit 9 - vIOAPIC logging -Bit 10 - hypercall logging -Bit 11 - MSR operation logging +> Bit 0 - debug level 0 (unused at present) +> Bit 1 - debug level 1 (Control Register logging) +> Bit 2 - debug level 2 (VMX logging of MSR restores when context switching) +> Bit 3 - debug level 3 (unused at present) +> Bit 4 - I/O operation logging +> Bit 5 - vMMU logging +> Bit 6 - vLAPIC general logging +> Bit 7 - vLAPIC timer logging +> Bit 8 - vLAPIC interrupt logging +> Bit 9 - vIOAPIC logging +> Bit 10 - hypercall logging +> Bit 11 - MSR operation logging Recognized in debug builds of the hypervisor only. @@ -1047,12 +1047,11 @@ resource. RMID is a hardware-provided layer of abstraction between software and logical processors. The following resources are available: -* Cache Monitoring Technology (Haswell and later). Information -regarding the L3 cache occupancy. -`cmt` instructs Xen to enable/disable Cache Monitoring Technology. - -`rmid_max` indicates the max value for rmid. +* Cache Monitoring Technology (Haswell and later). Information regarding the + L3 cache occupancy. + * `cmt` instructs Xen to enable/disable Cache Monitoring Technology. + * `rmid_max` indicates the max value for rmid. ### reboot > `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` -- generated by git-patchbot for /home/xen/git/xen.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 24 04:13:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xsl1w-0006zB-4T; Mon, 24 Nov 2014 04:13:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1u-0006ys-Dh for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:38 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 16/5C-22819-170B2745; Mon, 24 Nov 2014 04:13:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1416802416!5338611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12640 invoked from network); 24 Nov 2014 04:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 04:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1s-00028C-BL for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1s-0000ZF-AF for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:36 +0000 Date: Mon, 24 Nov 2014 04:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 6913fa31fa898f45ecc3b00e2397b8ebc75c8df4 Author: Andrew Cooper AuthorDate: Thu Nov 20 17:38:46 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:38:46 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 8ee9938..3e3353c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3619,6 +3619,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3638,13 +3644,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- generated by git-patchbot for /home/xen/git/xen.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 24 04:13:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 04: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 1Xsl1w-0006zB-4T; Mon, 24 Nov 2014 04:13:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1u-0006ys-Dh for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:38 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 16/5C-22819-170B2745; Mon, 24 Nov 2014 04:13:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1416802416!5338611!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12640 invoked from network); 24 Nov 2014 04:13:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 04:13:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsl1s-00028C-BL for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsl1s-0000ZF-AF for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 04:13:36 +0000 Date: Mon, 24 Nov 2014 04:13:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 6913fa31fa898f45ecc3b00e2397b8ebc75c8df4 Author: Andrew Cooper AuthorDate: Thu Nov 20 17:38:46 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:38:46 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 8ee9938..3e3353c 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3619,6 +3619,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3638,13 +3644,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- generated by git-patchbot for /home/xen/git/xen.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 24 08:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 08:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsojj-0001AW-BQ; Mon, 24 Nov 2014 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 1Xsojh-0001AR-Kf for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:05 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 8B/87-11581-818E2745; Mon, 24 Nov 2014 08:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1416816663!12971882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8075 invoked from network); 24 Nov 2014 08:11:04 -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; 24 Nov 2014 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 1Xsojf-0005Ai-HA for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsojf-0008UY-5y for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:03 +0000 Date: Mon, 24 Nov 2014 08:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't allow page table updates on non-PV page tables in do_mmu_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 6791ab169fe6b2cd7c69a5140cd229d036e706b0 Author: Jan Beulich AuthorDate: Tue Nov 18 14:32:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:32:57 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ec617b..121aef4 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3794,6 +3794,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + rc = xsm_mmu_normal_update(d, pt_owner, pg_owner, req.val); if ( rc ) break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 08:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 08:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsojj-0001AW-BQ; Mon, 24 Nov 2014 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 1Xsojh-0001AR-Kf for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:05 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id 8B/87-11581-818E2745; Mon, 24 Nov 2014 08:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1416816663!12971882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8075 invoked from network); 24 Nov 2014 08:11:04 -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; 24 Nov 2014 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 1Xsojf-0005Ai-HA for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsojf-0008UY-5y for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:03 +0000 Date: Mon, 24 Nov 2014 08:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: don't allow page table updates on non-PV page tables in do_mmu_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 6791ab169fe6b2cd7c69a5140cd229d036e706b0 Author: Jan Beulich AuthorDate: Tue Nov 18 14:32:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:32:57 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 9ec617b..121aef4 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3794,6 +3794,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + rc = xsm_mmu_normal_update(d, pt_owner, pg_owner, req.val); if ( rc ) break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 08:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 08: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 1Xsoju-0001BE-E7; Mon, 24 Nov 2014 08:11:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsojs-0001B3-TP for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:17 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B8/7D-03148-428E2745; Mon, 24 Nov 2014 08:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1416816674!14345681!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5323 invoked from network); 24 Nov 2014 08:11:15 -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; 24 Nov 2014 08:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsojp-0005Al-Ts for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsojp-0008V5-Lj for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:13 +0000 Date: Mon, 24 Nov 2014 08:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 301bd3e8c53f2478da537a223386e153d046a063 Author: Jan Beulich AuthorDate: Tue Nov 18 14:33:55 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:33:55 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 45a39b6..6480a27 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1107,7 +1107,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1179,9 +1179,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1246,7 +1260,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1255,7 +1269,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -1852,7 +1866,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2225,7 +2239,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2306,7 +2320,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2529,7 +2543,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2603,7 +2617,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2650,7 +2664,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3280,7 +3294,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3593,7 +3607,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = dst.val; @@ -3674,7 +3688,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 08:11:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 08: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 1Xsoju-0001BE-E7; Mon, 24 Nov 2014 08:11:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsojs-0001B3-TP for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:17 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id B8/7D-03148-428E2745; Mon, 24 Nov 2014 08:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1416816674!14345681!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5323 invoked from network); 24 Nov 2014 08:11:15 -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; 24 Nov 2014 08:11:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsojp-0005Al-Ts for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsojp-0008V5-Lj for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:13 +0000 Date: Mon, 24 Nov 2014 08:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 301bd3e8c53f2478da537a223386e153d046a063 Author: Jan Beulich AuthorDate: Tue Nov 18 14:33:55 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:33:55 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 45a39b6..6480a27 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1107,7 +1107,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1179,9 +1179,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1246,7 +1260,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1255,7 +1269,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -1852,7 +1866,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2225,7 +2239,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2306,7 +2320,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2529,7 +2543,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2603,7 +2617,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2650,7 +2664,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3280,7 +3294,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3593,7 +3607,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = dst.val; @@ -3674,7 +3688,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 08:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 08: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 1Xsok3-0001CR-Gg; Mon, 24 Nov 2014 08: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 1Xsok2-0001CI-Gb for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:26 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 66/01-15461-D28E2745; Mon, 24 Nov 2014 08:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1416816684!14830948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24522 invoked from network); 24 Nov 2014 08:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 08:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsok0-0005Ar-6y for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsok0-0008VX-1N for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:24 +0000 Date: Mon, 24 Nov 2014 08:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 dc37cab1d0f567639f52cad654068a7e56652e2e Author: Andrew Cooper AuthorDate: Thu Nov 20 17:47:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:47:07 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 121aef4..03808de 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3911,6 +3911,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3925,13 +3931,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- 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 24 08:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 08: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 1Xsok3-0001CR-Gg; Mon, 24 Nov 2014 08: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 1Xsok2-0001CI-Gb for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:26 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 66/01-15461-D28E2745; Mon, 24 Nov 2014 08:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1416816684!14830948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24522 invoked from network); 24 Nov 2014 08:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 08:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsok0-0005Ar-6y for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xsok0-0008VX-1N for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 08:11:24 +0000 Date: Mon, 24 Nov 2014 08:11:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 dc37cab1d0f567639f52cad654068a7e56652e2e Author: Andrew Cooper AuthorDate: Thu Nov 20 17:47:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:47:07 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 121aef4..03808de 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3911,6 +3911,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3925,13 +3931,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- 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 24 12:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 12:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspG-0003tO-Tj; Mon, 24 Nov 2014 12:33:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspF-0003tA-Fw for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:05 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id F1/88-02698-08523745; Mon, 24 Nov 2014 12:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1416832383!9807948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28408 invoked from network); 24 Nov 2014 12:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 12:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspD-00082K-35 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsspC-00007Q-TQ for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:02 +0000 Date: Mon, 24 Nov 2014 12:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: don't allow page table updates on non-PV page tables in do_mmu_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 c6e304d8335c9d8c447d743fd1163fbe8bccf245 Author: Jan Beulich AuthorDate: Tue Nov 18 14:30:37 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:30:37 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: e4292c5aac41b80f33d4877104348d5ee7c95aa4 master date: 2014-11-18 14:15:21 +0100 --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 646b127..6395c4f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3509,6 +3509,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + xsm_needed |= XSM_MMU_NORMAL_UPDATE; if ( get_pte_flags(req.val) & _PAGE_PRESENT ) { -- 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 24 12:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 12:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspG-0003tO-Tj; Mon, 24 Nov 2014 12:33:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspF-0003tA-Fw for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:05 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id F1/88-02698-08523745; Mon, 24 Nov 2014 12:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1416832383!9807948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28408 invoked from network); 24 Nov 2014 12:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Nov 2014 12:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspD-00082K-35 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsspC-00007Q-TQ for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:02 +0000 Date: Mon, 24 Nov 2014 12:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: don't allow page table updates on non-PV page tables in do_mmu_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 c6e304d8335c9d8c447d743fd1163fbe8bccf245 Author: Jan Beulich AuthorDate: Tue Nov 18 14:30:37 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:30:37 2014 +0100 x86: don't allow page table updates on non-PV page tables in do_mmu_update() paging_write_guest_entry() and paging_cmpxchg_guest_entry() aren't consistently supported for non-PV guests (they'd deref NULL for PVH or non-HAP HVM ones). Don't allow respective MMU_* operations on the page tables of such domains. This is CVE-2014-8594 / XSA-109. Signed-off-by: Jan Beulich Acked-by: Tim Deegan master commit: e4292c5aac41b80f33d4877104348d5ee7c95aa4 master date: 2014-11-18 14:15:21 +0100 --- xen/arch/x86/mm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 646b127..6395c4f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3509,6 +3509,10 @@ long do_mmu_update( { p2m_type_t p2mt; + rc = -EOPNOTSUPP; + if ( unlikely(paging_mode_refcounts(pt_owner)) ) + break; + xsm_needed |= XSM_MMU_NORMAL_UPDATE; if ( get_pte_flags(req.val) & _PAGE_PRESENT ) { -- 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 24 12:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 12: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 1XsspR-0003uT-02; Mon, 24 Nov 2014 12:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspQ-0003uK-43 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:16 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 62/47-28296-B8523745; Mon, 24 Nov 2014 12:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1416832393!13417243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12247 invoked from network); 24 Nov 2014 12:33:14 -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; 24 Nov 2014 12:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspN-00082O-9M for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsspN-00007t-6X for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:13 +0000 Date: Mon, 24 Nov 2014 12:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 82fa0623454a52c7d1812a9419c4cc09567d243d Author: Jan Beulich AuthorDate: Tue Nov 18 14:31:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:31:21 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 1d68c1a70e00ed95ef0889cfa005379dab27b37d master date: 2014-11-18 14:16:23 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b95f8a7..1e1e388 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1107,7 +1107,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1179,9 +1179,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1246,7 +1260,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1255,7 +1269,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -1852,7 +1866,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2222,7 +2236,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2303,7 +2317,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2526,7 +2540,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2600,7 +2614,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2647,7 +2661,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3277,7 +3291,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3590,7 +3604,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = dst.val; @@ -3671,7 +3685,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 12:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 12: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 1XsspR-0003uT-02; Mon, 24 Nov 2014 12:33:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspQ-0003uK-43 for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:16 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 62/47-28296-B8523745; Mon, 24 Nov 2014 12:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1416832393!13417243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12247 invoked from network); 24 Nov 2014 12:33:14 -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; 24 Nov 2014 12:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspN-00082O-9M for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsspN-00007t-6X for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:13 +0000 Date: Mon, 24 Nov 2014 12:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86emul: enforce privilege level restrictions when loading CS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 82fa0623454a52c7d1812a9419c4cc09567d243d Author: Jan Beulich AuthorDate: Tue Nov 18 14:31:21 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 18 14:31:21 2014 +0100 x86emul: enforce privilege level restrictions when loading CS Privilege level checks were basically missing for the CS case, the only check that was done (RPL == DPL for nonconforming segments) was solely covering a single special case (return to non-conforming segment). Additionally in long mode the L bit set requires the D bit to be clear, as was recently pointed out for KVM by Nadav Amit . Finally we also need to force the loaded selector's RPL to CPL (at least as long as lret/retf emulation doesn't support privilege level changes). This is CVE-2014-8595 / XSA-110. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 1d68c1a70e00ed95ef0889cfa005379dab27b37d master date: 2014-11-18 14:16:23 +0100 --- xen/arch/x86/x86_emulate/x86_emulate.c | 42 +++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b95f8a7..1e1e388 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1107,7 +1107,7 @@ realmode_load_seg( static int protmode_load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1179,9 +1179,23 @@ protmode_load_seg( /* Code segment? */ if ( !(desc.b & (1u<<11)) ) goto raise_exn; - /* Non-conforming segment: check DPL against RPL. */ - if ( ((desc.b & (6u<<9)) != (6u<<9)) && (dpl != rpl) ) + if ( is_ret + ? /* + * Really rpl < cpl, but our sole caller doesn't handle + * privilege level changes. + */ + rpl != cpl || (desc.b & (1 << 10) ? dpl > rpl : dpl != rpl) + : desc.b & (1 << 10) + /* Conforming segment: check DPL against CPL. */ + ? dpl > cpl + /* Non-conforming segment: check RPL and DPL against CPL. */ + : rpl > cpl || dpl != cpl ) + goto raise_exn; + /* 64-bit code segments (L bit set) must have D bit clear. */ + if ( in_longmode(ctxt, ops) && + (desc.b & (1 << 21)) && (desc.b & (1 << 22)) ) goto raise_exn; + sel = (sel ^ rpl) | cpl; break; case x86_seg_ss: /* Writable data segment? */ @@ -1246,7 +1260,7 @@ protmode_load_seg( static int load_seg( enum x86_segment seg, - uint16_t sel, + uint16_t sel, bool_t is_ret, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops) { @@ -1255,7 +1269,7 @@ load_seg( return X86EMUL_UNHANDLEABLE; if ( in_protmode(ctxt, ops) ) - return protmode_load_seg(seg, sel, ctxt, ops); + return protmode_load_seg(seg, sel, is_ret, ctxt, ops); return realmode_load_seg(seg, sel, ctxt, ops); } @@ -1852,7 +1866,7 @@ x86_emulate( if ( (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes), &dst.val, op_bytes, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(src.val, (uint16_t)dst.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(src.val, dst.val, 0, ctxt, ops)) != 0 ) return rc; break; @@ -2222,7 +2236,7 @@ x86_emulate( enum x86_segment seg = decode_segment(modrm_reg); generate_exception_if(seg == decode_segment_failed, EXC_UD, -1); generate_exception_if(seg == x86_seg_cs, EXC_UD, -1); - if ( (rc = load_seg(seg, (uint16_t)src.val, ctxt, ops)) != 0 ) + if ( (rc = load_seg(seg, src.val, 0, ctxt, ops)) != 0 ) goto done; if ( seg == x86_seg_ss ) ctxt->retire.flags.mov_ss = 1; @@ -2303,7 +2317,7 @@ x86_emulate( &_regs.eip, op_bytes, ctxt)) ) goto done; - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -2526,7 +2540,7 @@ x86_emulate( if ( (rc = read_ulong(src.mem.seg, src.mem.off + src.bytes, &sel, 2, ctxt, ops)) != 0 ) goto done; - if ( (rc = load_seg(dst.val, (uint16_t)sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(dst.val, sel, 0, ctxt, ops)) != 0 ) goto done; dst.val = src.val; break; @@ -2600,7 +2614,7 @@ x86_emulate( &dst.val, op_bytes, ctxt, ops)) || (rc = read_ulong(x86_seg_ss, sp_post_inc(op_bytes + offset), &src.val, op_bytes, ctxt, ops)) || - (rc = load_seg(x86_seg_cs, (uint16_t)src.val, ctxt, ops)) ) + (rc = load_seg(x86_seg_cs, src.val, 1, ctxt, ops)) ) goto done; _regs.eip = dst.val; break; @@ -2647,7 +2661,7 @@ x86_emulate( _regs.eflags &= mask; _regs.eflags |= (uint32_t)(eflags & ~mask) | 0x02; _regs.eip = eip; - if ( (rc = load_seg(x86_seg_cs, (uint16_t)cs, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, cs, 1, ctxt, ops)) != 0 ) goto done; break; } @@ -3277,7 +3291,7 @@ x86_emulate( generate_exception_if(mode_64bit(), EXC_UD, -1); eip = insn_fetch_bytes(op_bytes); sel = insn_fetch_type(uint16_t); - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = eip; break; @@ -3590,7 +3604,7 @@ x86_emulate( goto done; } - if ( (rc = load_seg(x86_seg_cs, sel, ctxt, ops)) != 0 ) + if ( (rc = load_seg(x86_seg_cs, sel, 0, ctxt, ops)) != 0 ) goto done; _regs.eip = dst.val; @@ -3671,7 +3685,7 @@ x86_emulate( generate_exception_if(!in_protmode(ctxt, ops), EXC_UD, -1); generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = load_seg((modrm_reg & 1) ? x86_seg_tr : x86_seg_ldtr, - src.val, ctxt, ops)) != 0 ) + src.val, 0, ctxt, ops)) != 0 ) goto done; break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Nov 24 12:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 12:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsspb-0003w5-ET; Mon, 24 Nov 2014 12:33:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspZ-0003vn-VI for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:26 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 33/E8-25727-59523745; Mon, 24 Nov 2014 12:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1416832403!13370578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15167 invoked from network); 24 Nov 2014 12:33:24 -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; 24 Nov 2014 12:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspX-00082a-Gp for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsspX-00008S-CZ for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:23 +0000 Date: Mon, 24 Nov 2014 12:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 62f1b78417f3a9afe8d40ee3c0d2f0495240cf47 Author: Andrew Cooper AuthorDate: Thu Nov 20 17:45:04 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:45:04 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 6395c4f..ab9359f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3635,6 +3635,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3654,13 +3660,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- 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 24 12:33:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 24 Nov 2014 12:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xsspb-0003w5-ET; Mon, 24 Nov 2014 12:33:27 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspZ-0003vn-VI for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:26 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 33/E8-25727-59523745; Mon, 24 Nov 2014 12:33:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1416832403!13370578!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15167 invoked from network); 24 Nov 2014 12:33:24 -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; 24 Nov 2014 12:33:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XsspX-00082a-Gp for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XsspX-00008S-CZ for xen-changelog@lists.xensource.com; Mon, 24 Nov 2014 12:33:23 +0000 Date: Mon, 24 Nov 2014 12:33:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/mm: fix a reference counting error in MMU_MACHPHYS_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 62f1b78417f3a9afe8d40ee3c0d2f0495240cf47 Author: Andrew Cooper AuthorDate: Thu Nov 20 17:45:04 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 20 17:45:04 2014 +0100 x86/mm: fix a reference counting error in MMU_MACHPHYS_UPDATE Any domain which can pass the XSM check against a translated guest can cause a page reference to be leaked. While shuffling the order of checks, drop the quite-pointless MEM_LOG(). This brings the check in line with similar checks in the vicinity. Discovered while reviewing the XSA-109/110 followup series. This is XSA-113. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/mm.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 6395c4f..ab9359f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3635,6 +3635,12 @@ long do_mmu_update( case MMU_MACHPHYS_UPDATE: + if ( unlikely(paging_mode_translate(pg_owner)) ) + { + rc = -EINVAL; + break; + } + mfn = req.ptr >> PAGE_SHIFT; gpfn = req.val; @@ -3654,13 +3660,6 @@ long do_mmu_update( break; } - if ( unlikely(paging_mode_translate(pg_owner)) ) - { - MEM_LOG("Mach-phys update on auto-translate guest"); - rc = -EINVAL; - break; - } - set_gpfn_from_mfn(mfn, gpfn); paging_mark_dirty(pg_owner, mfn); -- 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 25 19:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Nov 2014 19: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 1XtM1u-0002uV-Im; Tue, 25 Nov 2014 19:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtM1t-0002uO-FI for xen-changelog@lists.xensource.com; Tue, 25 Nov 2014 19:44:05 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id AF/A0-22777-40CD4745; Tue, 25 Nov 2014 19:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1416944643!9206736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15505 invoked from network); 25 Nov 2014 19:44:04 -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; 25 Nov 2014 19:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtM1r-0003BP-5r for xen-changelog@lists.xensource.com; Tue, 25 Nov 2014 19:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XtM1q-0003Sn-W0 for xen-changelog@lists.xensource.com; Tue, 25 Nov 2014 19:44:03 +0000 Date: Tue, 25 Nov 2014 19:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] hw/ide/core.c: Prevent SIGSEGV during migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a230ec3101ddda868252c036ea960af2b2d6cd5a Author: Don Slutz AuthorDate: Mon Nov 17 16:20:39 2014 -0500 Commit: Stefano Stabellini CommitDate: Wed Nov 19 11:18:38 2014 +0000 hw/ide/core.c: Prevent SIGSEGV during migration The other callers to blk_set_enable_write_cache() in this file already check for s->blk == NULL. upstream-commit-id: 6b896ab261942f441a16836e3fa3c83f3f4488b9 Signed-off-by: Don Slutz Reviewed-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi Message-id: 1416259239-13281-1-git-send-email-dslutz@verizon.com Signed-off-by: Peter Maydell Signed-off-by: Stefano Stabellini Release-Acked-by: Konrad Rzeszutek Wilk Conflicts: hw/ide/core.c --- hw/ide/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index c943a4d..227d903 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2270,7 +2270,7 @@ static int ide_drive_post_load(void *opaque, int version_id) { IDEState *s = opaque; - if (s->identify_set) { + if (s->bs && s->identify_set) { bdrv_set_enable_write_cache(s->bs, !!(s->identify_data[85] & (1 << 5))); } 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 Tue Nov 25 19:44:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 25 Nov 2014 19: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 1XtM1u-0002uV-Im; Tue, 25 Nov 2014 19:44:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtM1t-0002uO-FI for xen-changelog@lists.xensource.com; Tue, 25 Nov 2014 19:44:05 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id AF/A0-22777-40CD4745; Tue, 25 Nov 2014 19:44:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1416944643!9206736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15505 invoked from network); 25 Nov 2014 19:44:04 -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; 25 Nov 2014 19:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtM1r-0003BP-5r for xen-changelog@lists.xensource.com; Tue, 25 Nov 2014 19:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XtM1q-0003Sn-W0 for xen-changelog@lists.xensource.com; Tue, 25 Nov 2014 19:44:03 +0000 Date: Tue, 25 Nov 2014 19:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] hw/ide/core.c: Prevent SIGSEGV during migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a230ec3101ddda868252c036ea960af2b2d6cd5a Author: Don Slutz AuthorDate: Mon Nov 17 16:20:39 2014 -0500 Commit: Stefano Stabellini CommitDate: Wed Nov 19 11:18:38 2014 +0000 hw/ide/core.c: Prevent SIGSEGV during migration The other callers to blk_set_enable_write_cache() in this file already check for s->blk == NULL. upstream-commit-id: 6b896ab261942f441a16836e3fa3c83f3f4488b9 Signed-off-by: Don Slutz Reviewed-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi Message-id: 1416259239-13281-1-git-send-email-dslutz@verizon.com Signed-off-by: Peter Maydell Signed-off-by: Stefano Stabellini Release-Acked-by: Konrad Rzeszutek Wilk Conflicts: hw/ide/core.c --- hw/ide/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index c943a4d..227d903 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2270,7 +2270,7 @@ static int ide_drive_post_load(void *opaque, int version_id) { IDEState *s = opaque; - if (s->identify_set) { + if (s->bs && s->identify_set) { bdrv_set_enable_write_cache(s->bs, !!(s->identify_data[85] & (1 << 5))); } return 0; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Nov 26 05:44:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Nov 2014 05:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtVOb-0007Mi-IQ; Wed, 26 Nov 2014 05:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtVOa-0007Ma-3S for xen-changelog@lists.xensource.com; Wed, 26 Nov 2014 05:44:08 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id C7/BB-17958-7A865745; Wed, 26 Nov 2014 05:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1416980645!13885559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23912 invoked from network); 26 Nov 2014 05:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2014 05:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtVOU-0000Lv-RR for xen-changelog@lists.xensource.com; Wed, 26 Nov 2014 05:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XtVOU-0006Pb-BX for xen-changelog@lists.xensource.com; Wed, 26 Nov 2014 05:44:02 +0000 Date: Wed, 26 Nov 2014 05:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dpci: add 'masked' as a gate for hvm_dirq_assist to process X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 104072fc1c7e6ed117c70fa7f91ecc9946f8f654 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 24 17:07:16 2014 +0100 Commit: Jan Beulich CommitDate: Mon Nov 24 17:07:16 2014 +0100 dpci: add 'masked' as a gate for hvm_dirq_assist to process commit f6dd295381f4b6a66acddacf46bca8940586c8d8 "dpci: replace tasklet with softirq" used the 'masked' as an two-bit state mechanism (STATE_SCHED, STATE_RUN) to communicate between 'raise_softirq_for' and 'dpci_softirq' to determine whether the 'struct hvm_pirq_dpci' can be re-scheduled. However it ignored the 'pt_irq_guest_eoi' was not adhering to the proper dialogue and was not using locked cmpxchg or test_bit operations and ended setting 'state' set to zero. That meant 'raise_softirq_for' was free to schedule it while the 'struct hvm_pirq_dpci'' was still on an per-cpu list causing an list corruption. The code would trigger the following path causing list corruption: \-timer_softirq_action pt_irq_time_out calls pt_pirq_softirq_cancel sets state to 0. pirq_dpci is still on dpci_list. \- dpci_sofitrq while (!list_emptry(&our_list)) list_del, but has not yet done 'entry->next = LIST_POISON1;' [interrupt happens] raise_softirq checks state which is zero. Adds pirq_dpci to the dpci_list. [interrupt is done, back to dpci_softirq] finishes the entry->next = LIST_POISON1; .. test STATE_SCHED returns true, so executes the hvm_dirq_assist. ends the loop, exits. \- dpci_softirq while (!list_emtpry) list_del, but ->next already has LIST_POISON1 and we blow up. An alternative solution was proposed (adding STATE_ZOMBIE and making pt_irq_time_out use the cmpxchg protocol on 'state'), which fixed the above issue but had an fatal bug. It would miss interrupts that are to be scheduled! This patch brings back the 'masked' boolean which is used as an communication channel between 'hvm_do_IRQ_dpci', 'hvm_dirq_assist' and 'pt_irq_guest_eoi'. When we have an interrupt we set 'masked'. Anytime 'hvm_dirq_assist' or 'pt_irq_guest_eoi' executes - it clears it. The 'state' is left as a seperate mechanism to provide an mechanism between 'raise_sofitrq' and 'softirq_dpci' to communicate the state of the 'struct hvm_dirq_pirq'. However since we have now two seperate machines we have to deal with an cancellations and outstanding interrupt being serviced: 'pt_irq_destroy_bind' is called while an 'hvm_dirq_assist' is just about to service. The 'pt_irq_destroy_bind' takes the lock first and kills the timer - and the moment it releases the spinlock, 'hvm_dirq_assist' thunders in and calls 'set_timer' hitting an ASSERT. By clearing the 'masked' in the 'pt_irq_destroy_bind' we take care of that scenario by inhibiting 'hvm_dirq_assist' to call the 'set_timer'. In the 'pt_irq_create_bind' - in the error cases we could be seeing an softirq scheduled right away and being serviced (though stuck at the spinlock). The 'pt_irq_create_bind' fails in 'pt_pirq_softirq_reset' to change the 'state' (as the state is in 'STATE_RUN', not 'STATE_SCHED'). 'pt_irq_create_bind' continues on with setting '->flag=0' and unlocks the lock. 'hvm_dirq_assist' grabs the lock and continues one. Since 'flag = 0' and 'digl_list' is empty, it thunders through the 'hvm_dirq_assist' not doing anything until it hits 'set_timer' which is undefined for MSI. Adding in 'masked=0' for the MSI case fixes that. The legacy interrupt one does not need it as there is no chance of do_IRQ being called at that point. Reported-by: Sander Eikelenboom Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- xen/drivers/passthrough/io.c | 12 ++++++++++-- xen/include/xen/hvm/irq.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index efc66dc..ae050df 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -129,6 +129,13 @@ static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) pirq_dpci->dom = NULL; break; } + /* + * Inhibit 'hvm_dirq_assist' from doing anything useful and at worst + * calling 'set_timer' which will blow up (as we have called kill_timer + * or never initialized it). Note that we hold the lock that + * 'hvm_dirq_assist' could be spinning on. + */ + pirq_dpci->masked = 0; } bool_t pt_irq_need_timer(uint32_t flags) @@ -142,7 +149,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->state = 0; + pirq_dpci->masked = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -610,6 +617,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; + pirq_dpci->masked = 1; raise_softirq_for(pirq_dpci); return 1; } @@ -669,7 +677,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( pirq_dpci->state ) + if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 9709397..3996f1f 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -94,6 +94,7 @@ struct hvm_irq_dpci { struct hvm_pirq_dpci { uint32_t flags; unsigned int state; + bool_t masked; uint16_t pending; struct list_head digl_list; struct domain *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 Wed Nov 26 05:44:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 26 Nov 2014 05:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtVOb-0007Mi-IQ; Wed, 26 Nov 2014 05:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtVOa-0007Ma-3S for xen-changelog@lists.xensource.com; Wed, 26 Nov 2014 05:44:08 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id C7/BB-17958-7A865745; Wed, 26 Nov 2014 05:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1416980645!13885559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23912 invoked from network); 26 Nov 2014 05:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Nov 2014 05:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XtVOU-0000Lv-RR for xen-changelog@lists.xensource.com; Wed, 26 Nov 2014 05:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XtVOU-0006Pb-BX for xen-changelog@lists.xensource.com; Wed, 26 Nov 2014 05:44:02 +0000 Date: Wed, 26 Nov 2014 05:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] dpci: add 'masked' as a gate for hvm_dirq_assist to process X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 104072fc1c7e6ed117c70fa7f91ecc9946f8f654 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Nov 24 17:07:16 2014 +0100 Commit: Jan Beulich CommitDate: Mon Nov 24 17:07:16 2014 +0100 dpci: add 'masked' as a gate for hvm_dirq_assist to process commit f6dd295381f4b6a66acddacf46bca8940586c8d8 "dpci: replace tasklet with softirq" used the 'masked' as an two-bit state mechanism (STATE_SCHED, STATE_RUN) to communicate between 'raise_softirq_for' and 'dpci_softirq' to determine whether the 'struct hvm_pirq_dpci' can be re-scheduled. However it ignored the 'pt_irq_guest_eoi' was not adhering to the proper dialogue and was not using locked cmpxchg or test_bit operations and ended setting 'state' set to zero. That meant 'raise_softirq_for' was free to schedule it while the 'struct hvm_pirq_dpci'' was still on an per-cpu list causing an list corruption. The code would trigger the following path causing list corruption: \-timer_softirq_action pt_irq_time_out calls pt_pirq_softirq_cancel sets state to 0. pirq_dpci is still on dpci_list. \- dpci_sofitrq while (!list_emptry(&our_list)) list_del, but has not yet done 'entry->next = LIST_POISON1;' [interrupt happens] raise_softirq checks state which is zero. Adds pirq_dpci to the dpci_list. [interrupt is done, back to dpci_softirq] finishes the entry->next = LIST_POISON1; .. test STATE_SCHED returns true, so executes the hvm_dirq_assist. ends the loop, exits. \- dpci_softirq while (!list_emtpry) list_del, but ->next already has LIST_POISON1 and we blow up. An alternative solution was proposed (adding STATE_ZOMBIE and making pt_irq_time_out use the cmpxchg protocol on 'state'), which fixed the above issue but had an fatal bug. It would miss interrupts that are to be scheduled! This patch brings back the 'masked' boolean which is used as an communication channel between 'hvm_do_IRQ_dpci', 'hvm_dirq_assist' and 'pt_irq_guest_eoi'. When we have an interrupt we set 'masked'. Anytime 'hvm_dirq_assist' or 'pt_irq_guest_eoi' executes - it clears it. The 'state' is left as a seperate mechanism to provide an mechanism between 'raise_sofitrq' and 'softirq_dpci' to communicate the state of the 'struct hvm_dirq_pirq'. However since we have now two seperate machines we have to deal with an cancellations and outstanding interrupt being serviced: 'pt_irq_destroy_bind' is called while an 'hvm_dirq_assist' is just about to service. The 'pt_irq_destroy_bind' takes the lock first and kills the timer - and the moment it releases the spinlock, 'hvm_dirq_assist' thunders in and calls 'set_timer' hitting an ASSERT. By clearing the 'masked' in the 'pt_irq_destroy_bind' we take care of that scenario by inhibiting 'hvm_dirq_assist' to call the 'set_timer'. In the 'pt_irq_create_bind' - in the error cases we could be seeing an softirq scheduled right away and being serviced (though stuck at the spinlock). The 'pt_irq_create_bind' fails in 'pt_pirq_softirq_reset' to change the 'state' (as the state is in 'STATE_RUN', not 'STATE_SCHED'). 'pt_irq_create_bind' continues on with setting '->flag=0' and unlocks the lock. 'hvm_dirq_assist' grabs the lock and continues one. Since 'flag = 0' and 'digl_list' is empty, it thunders through the 'hvm_dirq_assist' not doing anything until it hits 'set_timer' which is undefined for MSI. Adding in 'masked=0' for the MSI case fixes that. The legacy interrupt one does not need it as there is no chance of do_IRQ being called at that point. Reported-by: Sander Eikelenboom Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- xen/drivers/passthrough/io.c | 12 ++++++++++-- xen/include/xen/hvm/irq.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index efc66dc..ae050df 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -129,6 +129,13 @@ static void pt_pirq_softirq_reset(struct hvm_pirq_dpci *pirq_dpci) pirq_dpci->dom = NULL; break; } + /* + * Inhibit 'hvm_dirq_assist' from doing anything useful and at worst + * calling 'set_timer' which will blow up (as we have called kill_timer + * or never initialized it). Note that we hold the lock that + * 'hvm_dirq_assist' could be spinning on. + */ + pirq_dpci->masked = 0; } bool_t pt_irq_need_timer(uint32_t flags) @@ -142,7 +149,7 @@ static int pt_irq_guest_eoi(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, if ( __test_and_clear_bit(_HVM_IRQ_DPCI_EOI_LATCH_SHIFT, &pirq_dpci->flags) ) { - pirq_dpci->state = 0; + pirq_dpci->masked = 0; pirq_dpci->pending = 0; pirq_guest_eoi(dpci_pirq(pirq_dpci)); } @@ -610,6 +617,7 @@ int hvm_do_IRQ_dpci(struct domain *d, struct pirq *pirq) !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) return 0; + pirq_dpci->masked = 1; raise_softirq_for(pirq_dpci); return 1; } @@ -669,7 +677,7 @@ static void hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci) ASSERT(d->arch.hvm_domain.irq.dpci); spin_lock(&d->event_lock); - if ( pirq_dpci->state ) + if ( test_and_clear_bool(pirq_dpci->masked) ) { struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; diff --git a/xen/include/xen/hvm/irq.h b/xen/include/xen/hvm/irq.h index 9709397..3996f1f 100644 --- a/xen/include/xen/hvm/irq.h +++ b/xen/include/xen/hvm/irq.h @@ -94,6 +94,7 @@ struct hvm_irq_dpci { struct hvm_pirq_dpci { uint32_t flags; unsigned int state; + bool_t masked; uint16_t pending; struct list_head digl_list; struct domain *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 Sat Nov 29 11:33:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 29 Nov 2014 11:33:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugGw-0004IQ-VS; Sat, 29 Nov 2014 11:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugGv-0004IH-SD for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 95/0E-02697-1FEA9745; Sat, 29 Nov 2014 11:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1417260783!13980452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1387 invoked from network); 29 Nov 2014 11:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Nov 2014 11:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugGt-0000D9-5u for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XugGs-0001jn-Ua for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:03 +0000 Date: Sat, 29 Nov 2014 11:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d80d71da3369ddfed5ec4cb822194cfd0faf23e Author: Jan Beulich AuthorDate: Thu Nov 27 14:17:32 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:17:32 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 8 ++++---- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2799e86..8599655 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1921,7 +1921,8 @@ unsigned long hypercall_create_continuation( } #ifdef CONFIG_COMPAT -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1930,7 +1931,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1939,7 +1943,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) { if ( !test_bit(_MCSF_call_preempted, &mcs->flags) ) return 0; - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1967,7 +1971,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index ef7822b..8cf3c3a 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -78,7 +78,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) } if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); break; } @@ -144,7 +144,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -379,7 +379,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -387,7 +387,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 2355cb9..3c8b97d 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -208,7 +208,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index 857cbc7..4f6af70 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -192,6 +192,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -211,7 +213,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 29 11:33:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 29 Nov 2014 11:33:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugGw-0004IQ-VS; Sat, 29 Nov 2014 11:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugGv-0004IH-SD for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 95/0E-02697-1FEA9745; Sat, 29 Nov 2014 11:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1417260783!13980452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1387 invoked from network); 29 Nov 2014 11:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Nov 2014 11:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugGt-0000D9-5u for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XugGs-0001jn-Ua for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:03 +0000 Date: Sat, 29 Nov 2014 11:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d80d71da3369ddfed5ec4cb822194cfd0faf23e Author: Jan Beulich AuthorDate: Thu Nov 27 14:17:32 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:17:32 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 8 ++++---- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2799e86..8599655 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1921,7 +1921,8 @@ unsigned long hypercall_create_continuation( } #ifdef CONFIG_COMPAT -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1930,7 +1931,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1939,7 +1943,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) { if ( !test_bit(_MCSF_call_preempted, &mcs->flags) ) return 0; - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1967,7 +1971,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index ef7822b..8cf3c3a 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -78,7 +78,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) } if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); break; } @@ -144,7 +144,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -379,7 +379,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -387,7 +387,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 2355cb9..3c8b97d 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -208,7 +208,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index 857cbc7..4f6af70 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -192,6 +192,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -211,7 +213,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 29 11:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 29 Nov 2014 11: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 1XugH7-0004JO-3g; Sat, 29 Nov 2014 11:33:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugH5-0004JA-S8 for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:15 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 03/8D-22819-BFEA9745; Sat, 29 Nov 2014 11:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1417260793!11116694!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15933 invoked from network); 29 Nov 2014 11:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Nov 2014 11:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugH3-0000DC-BT for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XugH3-0001kE-9L for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:13 +0000 Date: Sat, 29 Nov 2014 11:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: confine internally handled MMIO to solitary 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 3e5c06aeea1ff91c3f2247baae372936b67cf411 Author: Jan Beulich AuthorDate: Thu Nov 27 14:18:14 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:18:14 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 2ccc39e..1cedafa 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -131,11 +131,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1LL) * p->size + : p->addr + (p->count - 1LL) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -243,6 +256,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1LL) * p->size < addr + : p->addr + p->count * 1LL * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 0772714..a6abf78 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -236,6 +236,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -278,6 +280,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Nov 29 11:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 29 Nov 2014 11: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 1XugH7-0004JO-3g; Sat, 29 Nov 2014 11:33:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugH5-0004JA-S8 for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:15 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 03/8D-22819-BFEA9745; Sat, 29 Nov 2014 11:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1417260793!11116694!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15933 invoked from network); 29 Nov 2014 11:33:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 29 Nov 2014 11:33:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XugH3-0000DC-BT for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XugH3-0001kE-9L for xen-changelog@lists.xensource.com; Sat, 29 Nov 2014 11:33:13 +0000 Date: Sat, 29 Nov 2014 11:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/HVM: confine internally handled MMIO to solitary 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 3e5c06aeea1ff91c3f2247baae372936b67cf411 Author: Jan Beulich AuthorDate: Thu Nov 27 14:18:14 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:18:14 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 2ccc39e..1cedafa 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -131,11 +131,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1LL) * p->size + : p->addr + (p->count - 1LL) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -243,6 +256,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1LL) * p->size < addr + : p->addr + p->count * 1LL * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 0772714..a6abf78 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -236,6 +236,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -278,6 +280,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- 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 30 13:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4S0-0006AK-4J; Sun, 30 Nov 2014 13:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ry-0006A3-NC for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:06 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6F/D3-02957-EF91B745; Sun, 30 Nov 2014 13:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1417353724!6589496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7042 invoked from network); 30 Nov 2014 13:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Rw-0008CH-66 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Rv-0000ZX-Vc for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:04 +0000 Date: Sun, 30 Nov 2014 13:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuidle: don't count C1 multiple times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0aabd10525326edfe5098c2ec5bfe05db7732c32 Author: Jan Beulich AuthorDate: Tue Nov 25 10:05:29 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:05:29 2014 +0100 x86/cpuidle: don't count C1 multiple times Commit 4ca6f9f0 ("x86/cpuidle: publish new states only after fully initializing them") resulted in the state counter to be incremented for C1 despite that using a fixed table entry (and the statically initialized counter value already accounting for it and C0). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/acpi/cpu_idle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index f72719c..2b2bcc6 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1000,7 +1000,7 @@ static void set_cx( cx->target_residency = cx->latency * latency_factor; smp_wmb(); - acpi_power->count++; + acpi_power->count += (cx->type != ACPI_STATE_C1); if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) acpi_power->safe_state = 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 Sun Nov 30 13:22:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4S0-0006AK-4J; Sun, 30 Nov 2014 13:22:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ry-0006A3-NC for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:06 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6F/D3-02957-EF91B745; Sun, 30 Nov 2014 13:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1417353724!6589496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7042 invoked from network); 30 Nov 2014 13:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Rw-0008CH-66 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Rv-0000ZX-Vc for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:04 +0000 Date: Sun, 30 Nov 2014 13:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpuidle: don't count C1 multiple times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0aabd10525326edfe5098c2ec5bfe05db7732c32 Author: Jan Beulich AuthorDate: Tue Nov 25 10:05:29 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:05:29 2014 +0100 x86/cpuidle: don't count C1 multiple times Commit 4ca6f9f0 ("x86/cpuidle: publish new states only after fully initializing them") resulted in the state counter to be incremented for C1 despite that using a fixed table entry (and the statically initialized counter value already accounting for it and C0). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/acpi/cpu_idle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index f72719c..2b2bcc6 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1000,7 +1000,7 @@ static void set_cx( cx->target_residency = cx->latency * latency_factor; smp_wmb(); - acpi_power->count++; + acpi_power->count += (cx->type != ACPI_STATE_C1); if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) acpi_power->safe_state = 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 Sun Nov 30 13:22:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SD-0006C1-7N; Sun, 30 Nov 2014 13:22:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SC-0006Bn-8q for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:20 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 81/5B-22819-B0A1B745; Sun, 30 Nov 2014 13:22:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1417353734!14060508!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15792 invoked from network); 30 Nov 2014 13:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4S6-0008CN-IE for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4S6-0000Zw-Ad for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:14 +0000 Date: Sun, 30 Nov 2014 13:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: tighten page table owner checking in do_mmu_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 dc419f0a3752032ab00124dc55609d9231e53128 Author: Jan Beulich AuthorDate: Tue Nov 25 10:07:09 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:07:09 2014 +0100 x86: tighten page table owner checking in do_mmu_update() MMU_MACHPHYS_UPDATE, not manipulating page tables, shouldn't ignore a bad page table domain being specified. Also pt_owner can't be NULL when reaching the "out" label, so the respective check can be dropped. Signed-off-by: Jan Beulich Acked-by: Tim Deegan Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/mm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 3e3353c..61b8e77 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3618,6 +3618,11 @@ long do_mmu_update( break; case MMU_MACHPHYS_UPDATE: + if ( unlikely(d != pt_owner) ) + { + rc = -EPERM; + break; + } if ( unlikely(paging_mode_translate(pg_owner)) ) { @@ -3693,7 +3698,7 @@ long do_mmu_update( perfc_add(num_page_updates, i); out: - if ( pt_owner && (pt_owner != d) ) + if ( pt_owner != d ) rcu_unlock_domain(pt_owner); /* Add incremental work we have done to the @done output parameter. */ -- generated by git-patchbot for /home/xen/git/xen.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 30 13:22:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SD-0006C1-7N; Sun, 30 Nov 2014 13:22:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SC-0006Bn-8q for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:20 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 81/5B-22819-B0A1B745; Sun, 30 Nov 2014 13:22:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1417353734!14060508!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15792 invoked from network); 30 Nov 2014 13:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4S6-0008CN-IE for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4S6-0000Zw-Ad for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:14 +0000 Date: Sun, 30 Nov 2014 13:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: tighten page table owner checking in do_mmu_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 dc419f0a3752032ab00124dc55609d9231e53128 Author: Jan Beulich AuthorDate: Tue Nov 25 10:07:09 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:07:09 2014 +0100 x86: tighten page table owner checking in do_mmu_update() MMU_MACHPHYS_UPDATE, not manipulating page tables, shouldn't ignore a bad page table domain being specified. Also pt_owner can't be NULL when reaching the "out" label, so the respective check can be dropped. Signed-off-by: Jan Beulich Acked-by: Tim Deegan Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/mm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 3e3353c..61b8e77 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3618,6 +3618,11 @@ long do_mmu_update( break; case MMU_MACHPHYS_UPDATE: + if ( unlikely(d != pt_owner) ) + { + rc = -EPERM; + break; + } if ( unlikely(paging_mode_translate(pg_owner)) ) { @@ -3693,7 +3698,7 @@ long do_mmu_update( perfc_add(num_page_updates, i); out: - if ( pt_owner && (pt_owner != d) ) + if ( pt_owner != d ) rcu_unlock_domain(pt_owner); /* Add incremental work we have done to the @done output parameter. */ -- generated by git-patchbot for /home/xen/git/xen.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 30 13:22:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SL-0006Ds-9s; Sun, 30 Nov 2014 13:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SJ-0006DN-Ov for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:27 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 17/87-18267-31A1B745; Sun, 30 Nov 2014 13:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1417353745!14789546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30752 invoked from network); 30 Nov 2014 13:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SG-0008CT-OD for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4SG-0000aL-Mh for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:24 +0000 Date: Sun, 30 Nov 2014 13:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't ignore foreigndom input on various MMUEXT 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 1516b33961028ba4f6e70c0da464e9ed0a190760 Author: Jan Beulich AuthorDate: Tue Nov 25 10:08:04 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:08:04 2014 +0100 x86: don't ignore foreigndom input on various MMUEXT ops Instead properly fail requests that shouldn't be issued on foreign domains or - for MMUEXT_{CLEAR,COPY}_PAGE - extend the existing operation to work that way. In the course of doing this the need to always clear "okay" even when wanting an error code other than -EINVAL became unwieldy, so the respective logic is being adjusted at once, together with a little other related cleanup. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/mm.c | 126 ++++++++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 61b8e77..522c43d 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3062,23 +3062,23 @@ long do_mmuext_op( } case MMUEXT_NEW_BASEPTR: - if ( paging_mode_translate(d) ) - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(paging_mode_translate(d)) ) + rc = -EINVAL; else - { rc = new_guest_cr3(op.arg1.mfn); - okay = !rc; - } break; case MMUEXT_NEW_USER_BASEPTR: { unsigned long old_mfn; - if ( paging_mode_translate(current->domain) ) - { - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(paging_mode_translate(d)) ) + rc = -EINVAL; + if ( unlikely(rc) ) break; - } old_mfn = pagetable_get_pfn(curr->arch.guest_table_user); /* @@ -3136,12 +3136,17 @@ long do_mmuext_op( } case MMUEXT_TLB_FLUSH_LOCAL: - flush_tlb_local(); + if ( likely(d == pg_owner) ) + flush_tlb_local(); + else + rc = -EPERM; break; case MMUEXT_INVLPG_LOCAL: - if ( !paging_mode_enabled(d) - || paging_invlpg(curr, op.arg1.linear_addr) != 0 ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( !paging_mode_enabled(d) || + paging_invlpg(curr, op.arg1.linear_addr) != 0 ) flush_tlb_one_local(op.arg1.linear_addr); break; @@ -3150,13 +3155,16 @@ long do_mmuext_op( { cpumask_t pmask; - if ( unlikely(vcpumask_to_pcpumask(d, - guest_handle_to_param(op.arg2.vcpumask, const_void), - &pmask)) ) - { - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(vcpumask_to_pcpumask(d, + guest_handle_to_param(op.arg2.vcpumask, + const_void), + &pmask)) ) + rc = -EINVAL; + if ( unlikely(rc) ) break; - } + if ( op.cmd == MMUEXT_TLB_FLUSH_MULTI ) flush_tlb_mask(&pmask); else @@ -3165,18 +3173,26 @@ long do_mmuext_op( } case MMUEXT_TLB_FLUSH_ALL: - flush_tlb_mask(d->domain_dirty_cpumask); + if ( likely(d == pg_owner) ) + flush_tlb_mask(d->domain_dirty_cpumask); + else + rc = -EPERM; break; case MMUEXT_INVLPG_ALL: - flush_tlb_one_mask(d->domain_dirty_cpumask, op.arg1.linear_addr); + if ( likely(d == pg_owner) ) + flush_tlb_one_mask(d->domain_dirty_cpumask, op.arg1.linear_addr); + else + rc = -EPERM; break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(!cache_flush_permitted(d)) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(!cache_flush_permitted(d)) ) { MEM_LOG("Non-physdev domain tried to FLUSH_CACHE."); - okay = 0; + rc = -EACCES; } else { @@ -3185,8 +3201,8 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE_GLOBAL: - if ( unlikely(foreigndom != DOMID_SELF) ) - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; else if ( likely(cache_flush_permitted(d)) ) { unsigned int cpu; @@ -3211,7 +3227,9 @@ long do_mmuext_op( unsigned long ptr = op.arg1.linear_addr; unsigned long ents = op.arg2.nr_ents; - if ( paging_mode_external(d) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( paging_mode_external(d) ) { MEM_LOG("ignoring SET_LDT hypercall from external domain"); okay = 0; @@ -3237,7 +3255,7 @@ long do_mmuext_op( case MMUEXT_CLEAR_PAGE: { struct page_info *page; - page = get_page_from_gfn(d, op.arg1.mfn, NULL, P2M_ALLOC); + page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, P2M_ALLOC); if ( !page || !get_page_type(page, PGT_writable_page) ) { if ( page ) @@ -3248,7 +3266,7 @@ long do_mmuext_op( } /* A page is dirtied when it's being cleared. */ - paging_mark_dirty(d, page_to_mfn(page)); + paging_mark_dirty(pg_owner, page_to_mfn(page)); clear_domain_page(page_to_mfn(page)); @@ -3260,7 +3278,8 @@ long do_mmuext_op( { struct page_info *src_page, *dst_page; - src_page = get_page_from_gfn(d, op.arg2.src_mfn, NULL, P2M_ALLOC); + src_page = get_page_from_gfn(pg_owner, op.arg2.src_mfn, NULL, + P2M_ALLOC); if ( unlikely(!src_page) ) { okay = 0; @@ -3268,7 +3287,8 @@ long do_mmuext_op( break; } - dst_page = get_page_from_gfn(d, op.arg1.mfn, NULL, P2M_ALLOC); + dst_page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, + P2M_ALLOC); okay = (dst_page && get_page_type(dst_page, PGT_writable_page)); if ( unlikely(!okay) ) { @@ -3280,7 +3300,7 @@ long do_mmuext_op( } /* A page is dirtied when it's being copied to. */ - paging_mark_dirty(d, page_to_mfn(dst_page)); + paging_mark_dirty(pg_owner, page_to_mfn(dst_page)); copy_domain_page(page_to_mfn(dst_page), page_to_mfn(src_page)); @@ -3291,68 +3311,56 @@ long do_mmuext_op( case MMUEXT_MARK_SUPER: { - unsigned long mfn; - struct spage_info *spage; + unsigned long mfn = op.arg1.mfn; - mfn = op.arg1.mfn; - if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) { MEM_LOG("Unaligned superpage reference mfn %lx", mfn); okay = 0; - break; } - - if ( !opt_allow_superpage ) + else if ( !opt_allow_superpage ) { MEM_LOG("Superpages disallowed"); - okay = 0; rc = -ENOSYS; - break; } - - spage = mfn_to_spage(mfn); - okay = (mark_superpage(spage, d) >= 0); + else + rc = mark_superpage(mfn_to_spage(mfn), d); break; } case MMUEXT_UNMARK_SUPER: { - unsigned long mfn; - struct spage_info *spage; + unsigned long mfn = op.arg1.mfn; - mfn = op.arg1.mfn; - if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) { MEM_LOG("Unaligned superpage reference mfn %lx", mfn); okay = 0; - break; } - - if ( !opt_allow_superpage ) + else if ( !opt_allow_superpage ) { MEM_LOG("Superpages disallowed"); - okay = 0; rc = -ENOSYS; - break; } - - spage = mfn_to_spage(mfn); - okay = (unmark_superpage(spage) >= 0); + else + rc = unmark_superpage(mfn_to_spage(mfn)); break; } default: MEM_LOG("Invalid extended pt command %#x", op.cmd); rc = -ENOSYS; - okay = 0; break; } - if ( unlikely(!okay) ) - { - rc = rc ? rc : -EINVAL; + if ( unlikely(!okay) && !rc ) + rc = -EINVAL; + if ( unlikely(rc) ) break; - } guest_handle_add_offset(uops, 1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:22:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SL-0006Ds-9s; Sun, 30 Nov 2014 13:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SJ-0006DN-Ov for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:27 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 17/87-18267-31A1B745; Sun, 30 Nov 2014 13:22:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1417353745!14789546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30752 invoked from network); 30 Nov 2014 13:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SG-0008CT-OD for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4SG-0000aL-Mh for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:24 +0000 Date: Sun, 30 Nov 2014 13:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't ignore foreigndom input on various MMUEXT 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 1516b33961028ba4f6e70c0da464e9ed0a190760 Author: Jan Beulich AuthorDate: Tue Nov 25 10:08:04 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:08:04 2014 +0100 x86: don't ignore foreigndom input on various MMUEXT ops Instead properly fail requests that shouldn't be issued on foreign domains or - for MMUEXT_{CLEAR,COPY}_PAGE - extend the existing operation to work that way. In the course of doing this the need to always clear "okay" even when wanting an error code other than -EINVAL became unwieldy, so the respective logic is being adjusted at once, together with a little other related cleanup. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/mm.c | 126 ++++++++++++++++++++++++++++------------------------- 1 files changed, 67 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 61b8e77..522c43d 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3062,23 +3062,23 @@ long do_mmuext_op( } case MMUEXT_NEW_BASEPTR: - if ( paging_mode_translate(d) ) - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(paging_mode_translate(d)) ) + rc = -EINVAL; else - { rc = new_guest_cr3(op.arg1.mfn); - okay = !rc; - } break; case MMUEXT_NEW_USER_BASEPTR: { unsigned long old_mfn; - if ( paging_mode_translate(current->domain) ) - { - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(paging_mode_translate(d)) ) + rc = -EINVAL; + if ( unlikely(rc) ) break; - } old_mfn = pagetable_get_pfn(curr->arch.guest_table_user); /* @@ -3136,12 +3136,17 @@ long do_mmuext_op( } case MMUEXT_TLB_FLUSH_LOCAL: - flush_tlb_local(); + if ( likely(d == pg_owner) ) + flush_tlb_local(); + else + rc = -EPERM; break; case MMUEXT_INVLPG_LOCAL: - if ( !paging_mode_enabled(d) - || paging_invlpg(curr, op.arg1.linear_addr) != 0 ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( !paging_mode_enabled(d) || + paging_invlpg(curr, op.arg1.linear_addr) != 0 ) flush_tlb_one_local(op.arg1.linear_addr); break; @@ -3150,13 +3155,16 @@ long do_mmuext_op( { cpumask_t pmask; - if ( unlikely(vcpumask_to_pcpumask(d, - guest_handle_to_param(op.arg2.vcpumask, const_void), - &pmask)) ) - { - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(vcpumask_to_pcpumask(d, + guest_handle_to_param(op.arg2.vcpumask, + const_void), + &pmask)) ) + rc = -EINVAL; + if ( unlikely(rc) ) break; - } + if ( op.cmd == MMUEXT_TLB_FLUSH_MULTI ) flush_tlb_mask(&pmask); else @@ -3165,18 +3173,26 @@ long do_mmuext_op( } case MMUEXT_TLB_FLUSH_ALL: - flush_tlb_mask(d->domain_dirty_cpumask); + if ( likely(d == pg_owner) ) + flush_tlb_mask(d->domain_dirty_cpumask); + else + rc = -EPERM; break; case MMUEXT_INVLPG_ALL: - flush_tlb_one_mask(d->domain_dirty_cpumask, op.arg1.linear_addr); + if ( likely(d == pg_owner) ) + flush_tlb_one_mask(d->domain_dirty_cpumask, op.arg1.linear_addr); + else + rc = -EPERM; break; case MMUEXT_FLUSH_CACHE: - if ( unlikely(!cache_flush_permitted(d)) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( unlikely(!cache_flush_permitted(d)) ) { MEM_LOG("Non-physdev domain tried to FLUSH_CACHE."); - okay = 0; + rc = -EACCES; } else { @@ -3185,8 +3201,8 @@ long do_mmuext_op( break; case MMUEXT_FLUSH_CACHE_GLOBAL: - if ( unlikely(foreigndom != DOMID_SELF) ) - okay = 0; + if ( unlikely(d != pg_owner) ) + rc = -EPERM; else if ( likely(cache_flush_permitted(d)) ) { unsigned int cpu; @@ -3211,7 +3227,9 @@ long do_mmuext_op( unsigned long ptr = op.arg1.linear_addr; unsigned long ents = op.arg2.nr_ents; - if ( paging_mode_external(d) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( paging_mode_external(d) ) { MEM_LOG("ignoring SET_LDT hypercall from external domain"); okay = 0; @@ -3237,7 +3255,7 @@ long do_mmuext_op( case MMUEXT_CLEAR_PAGE: { struct page_info *page; - page = get_page_from_gfn(d, op.arg1.mfn, NULL, P2M_ALLOC); + page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, P2M_ALLOC); if ( !page || !get_page_type(page, PGT_writable_page) ) { if ( page ) @@ -3248,7 +3266,7 @@ long do_mmuext_op( } /* A page is dirtied when it's being cleared. */ - paging_mark_dirty(d, page_to_mfn(page)); + paging_mark_dirty(pg_owner, page_to_mfn(page)); clear_domain_page(page_to_mfn(page)); @@ -3260,7 +3278,8 @@ long do_mmuext_op( { struct page_info *src_page, *dst_page; - src_page = get_page_from_gfn(d, op.arg2.src_mfn, NULL, P2M_ALLOC); + src_page = get_page_from_gfn(pg_owner, op.arg2.src_mfn, NULL, + P2M_ALLOC); if ( unlikely(!src_page) ) { okay = 0; @@ -3268,7 +3287,8 @@ long do_mmuext_op( break; } - dst_page = get_page_from_gfn(d, op.arg1.mfn, NULL, P2M_ALLOC); + dst_page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, + P2M_ALLOC); okay = (dst_page && get_page_type(dst_page, PGT_writable_page)); if ( unlikely(!okay) ) { @@ -3280,7 +3300,7 @@ long do_mmuext_op( } /* A page is dirtied when it's being copied to. */ - paging_mark_dirty(d, page_to_mfn(dst_page)); + paging_mark_dirty(pg_owner, page_to_mfn(dst_page)); copy_domain_page(page_to_mfn(dst_page), page_to_mfn(src_page)); @@ -3291,68 +3311,56 @@ long do_mmuext_op( case MMUEXT_MARK_SUPER: { - unsigned long mfn; - struct spage_info *spage; + unsigned long mfn = op.arg1.mfn; - mfn = op.arg1.mfn; - if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) { MEM_LOG("Unaligned superpage reference mfn %lx", mfn); okay = 0; - break; } - - if ( !opt_allow_superpage ) + else if ( !opt_allow_superpage ) { MEM_LOG("Superpages disallowed"); - okay = 0; rc = -ENOSYS; - break; } - - spage = mfn_to_spage(mfn); - okay = (mark_superpage(spage, d) >= 0); + else + rc = mark_superpage(mfn_to_spage(mfn), d); break; } case MMUEXT_UNMARK_SUPER: { - unsigned long mfn; - struct spage_info *spage; + unsigned long mfn = op.arg1.mfn; - mfn = op.arg1.mfn; - if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) + if ( unlikely(d != pg_owner) ) + rc = -EPERM; + else if ( mfn & (L1_PAGETABLE_ENTRIES-1) ) { MEM_LOG("Unaligned superpage reference mfn %lx", mfn); okay = 0; - break; } - - if ( !opt_allow_superpage ) + else if ( !opt_allow_superpage ) { MEM_LOG("Superpages disallowed"); - okay = 0; rc = -ENOSYS; - break; } - - spage = mfn_to_spage(mfn); - okay = (unmark_superpage(spage) >= 0); + else + rc = unmark_superpage(mfn_to_spage(mfn)); break; } default: MEM_LOG("Invalid extended pt command %#x", op.cmd); rc = -ENOSYS; - okay = 0; break; } - if ( unlikely(!okay) ) - { - rc = rc ? rc : -EINVAL; + if ( unlikely(!okay) && !rc ) + rc = -EINVAL; + if ( unlikely(rc) ) break; - } guest_handle_add_offset(uops, 1); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:22:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SV-0006Fl-Cl; Sun, 30 Nov 2014 13:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4ST-0006FP-Rb for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:37 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 44/5E-16982-D1A1B745; Sun, 30 Nov 2014 13:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1417353755!12339376!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18084 invoked from network); 30 Nov 2014 13:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SQ-0008Cb-To for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4SQ-0000am-SH for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:34 +0000 Date: Sun, 30 Nov 2014 13:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: don't crash guest upon problems occurring in user 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 28b4baacd599e8c10e6dac055f6a939bb730fb8a Author: Jan Beulich AuthorDate: Tue Nov 25 10:08:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:08:57 2014 +0100 x86/HVM: don't crash guest upon problems occurring in user mode This extends commit 5283b310 ("x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode") to a few more cases, including the failed VM entry one that XSA-110 was needed to be issued for. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/svm/svm.c | 17 +++++++++++------ xen/arch/x86/hvm/vmx/vmx.c | 29 +++++++++++++++-------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 8aca6e6..9398690 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -90,6 +90,15 @@ static bool_t amd_erratum383_found __read_mostly; static uint64_t osvw_length, osvw_status; static DEFINE_SPINLOCK(osvw_lock); +/* Only crash the guest if the problem originates in kernel mode. */ +static void svm_crash_or_fault(struct vcpu *v) +{ + if ( vmcb_get_cpl(v->arch.hvm_svm.vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) { struct vcpu *curr = current; @@ -100,7 +109,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len > 15) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); - domain_crash(curr->domain); + svm_crash_or_fault(curr); return; } @@ -2680,11 +2689,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - if ( vmcb_get_cpl(vmcb) ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); + svm_crash_or_fault(v); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0bf92b2..2907afa 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -134,6 +134,18 @@ static void vmx_vcpu_destroy(struct vcpu *v) passive_domain_destroy(v); } +/* Only crash the guest if the problem originates in kernel mode. */ +static void vmx_crash_or_fault(struct vcpu *v) +{ + struct segment_register ss; + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + static DEFINE_PER_CPU(struct vmx_msr_state, host_msr_state); static const u32 msr_index[] = @@ -2508,7 +2520,7 @@ static void vmx_failed_vmentry(unsigned int exit_reason, vmcs_dump_vcpu(curr); printk("**************************************\n"); - domain_crash(curr->domain); + vmx_crash_or_fault(curr); } void vmx_enter_realmode(struct cpu_user_regs *regs) @@ -3161,19 +3173,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - { - struct segment_register ss; - - gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", - exit_reason); - - vmx_get_segment_register(v, x86_seg_ss, &ss); - if ( ss.attr.fields.dpl ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); - } + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", exit_reason); + vmx_crash_or_fault(v); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:22:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SV-0006Fl-Cl; Sun, 30 Nov 2014 13:22:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4ST-0006FP-Rb for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:37 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 44/5E-16982-D1A1B745; Sun, 30 Nov 2014 13:22:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1417353755!12339376!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18084 invoked from network); 30 Nov 2014 13:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4SQ-0008Cb-To for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4SQ-0000am-SH for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:34 +0000 Date: Sun, 30 Nov 2014 13:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: don't crash guest upon problems occurring in user 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 28b4baacd599e8c10e6dac055f6a939bb730fb8a Author: Jan Beulich AuthorDate: Tue Nov 25 10:08:57 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 10:08:57 2014 +0100 x86/HVM: don't crash guest upon problems occurring in user mode This extends commit 5283b310 ("x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode") to a few more cases, including the failed VM entry one that XSA-110 was needed to be issued for. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/svm/svm.c | 17 +++++++++++------ xen/arch/x86/hvm/vmx/vmx.c | 29 +++++++++++++++-------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 8aca6e6..9398690 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -90,6 +90,15 @@ static bool_t amd_erratum383_found __read_mostly; static uint64_t osvw_length, osvw_status; static DEFINE_SPINLOCK(osvw_lock); +/* Only crash the guest if the problem originates in kernel mode. */ +static void svm_crash_or_fault(struct vcpu *v) +{ + if ( vmcb_get_cpl(v->arch.hvm_svm.vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) { struct vcpu *curr = current; @@ -100,7 +109,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len > 15) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); - domain_crash(curr->domain); + svm_crash_or_fault(curr); return; } @@ -2680,11 +2689,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - if ( vmcb_get_cpl(vmcb) ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); + svm_crash_or_fault(v); break; } diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0bf92b2..2907afa 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -134,6 +134,18 @@ static void vmx_vcpu_destroy(struct vcpu *v) passive_domain_destroy(v); } +/* Only crash the guest if the problem originates in kernel mode. */ +static void vmx_crash_or_fault(struct vcpu *v) +{ + struct segment_register ss; + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + static DEFINE_PER_CPU(struct vmx_msr_state, host_msr_state); static const u32 msr_index[] = @@ -2508,7 +2520,7 @@ static void vmx_failed_vmentry(unsigned int exit_reason, vmcs_dump_vcpu(curr); printk("**************************************\n"); - domain_crash(curr->domain); + vmx_crash_or_fault(curr); } void vmx_enter_realmode(struct cpu_user_regs *regs) @@ -3161,19 +3173,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - { - struct segment_register ss; - - gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", - exit_reason); - - vmx_get_segment_register(v, x86_seg_ss, &ss); - if ( ss.attr.fields.dpl ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); - } + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", exit_reason); + vmx_crash_or_fault(v); break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:22:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sf-0006Hw-Ff; Sun, 30 Nov 2014 13:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sd-0006HY-NO for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:47 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 53/B2-20609-72A1B745; Sun, 30 Nov 2014 13:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1417353765!12011861!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17430 invoked from network); 30 Nov 2014 13:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sb-0008Ch-3i for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Sb-0000b8-1v for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:45 +0000 Date: Sun, 30 Nov 2014 13:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Return proper error codes for block-attach and block-detach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47c6e7f28ddc27f194c7c4902ea3163ba582b582 Author: George Dunlap AuthorDate: Wed Nov 12 17:31:33 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 14:04:04 2014 +0000 xl: Return proper error codes for block-attach and block-detach Return proper error codes on failure so that scripts can tell whether the command completed properly or not. This is not a proper fix, since it fails to call libxl_device_disk_dispose() on the error path. But a proper fix requires some refactoring, so given where we are in the release process, it's better to have a fix that is simple and obvious, and do the refactoring once the next development window opens up. Signed-off-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9afef3f..0e754e7 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6383,6 +6383,7 @@ int main_blockattach(int argc, char **argv) if (libxl_device_disk_add(ctx, fe_domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_add failed.\n"); + return 1; } return 0; } @@ -6444,6 +6445,7 @@ int main_blockdetach(int argc, char **argv) rc = libxl_device_disk_remove(ctx, domid, &disk, 0); if (rc) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); + return 1; } libxl_device_disk_dispose(&disk); 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 Sun Nov 30 13:22:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:22:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sf-0006Hw-Ff; Sun, 30 Nov 2014 13:22:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sd-0006HY-NO for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:47 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 53/B2-20609-72A1B745; Sun, 30 Nov 2014 13:22:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1417353765!12011861!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17430 invoked from network); 30 Nov 2014 13:22:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sb-0008Ch-3i for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Sb-0000b8-1v for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:45 +0000 Date: Sun, 30 Nov 2014 13:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: Return proper error codes for block-attach and block-detach X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47c6e7f28ddc27f194c7c4902ea3163ba582b582 Author: George Dunlap AuthorDate: Wed Nov 12 17:31:33 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 14:04:04 2014 +0000 xl: Return proper error codes for block-attach and block-detach Return proper error codes on failure so that scripts can tell whether the command completed properly or not. This is not a proper fix, since it fails to call libxl_device_disk_dispose() on the error path. But a proper fix requires some refactoring, so given where we are in the release process, it's better to have a fix that is simple and obvious, and do the refactoring once the next development window opens up. Signed-off-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 9afef3f..0e754e7 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6383,6 +6383,7 @@ int main_blockattach(int argc, char **argv) if (libxl_device_disk_add(ctx, fe_domid, &disk, 0)) { fprintf(stderr, "libxl_device_disk_add failed.\n"); + return 1; } return 0; } @@ -6444,6 +6445,7 @@ int main_blockdetach(int argc, char **argv) rc = libxl_device_disk_remove(ctx, domid, &disk, 0); if (rc) { fprintf(stderr, "libxl_device_disk_remove failed.\n"); + return 1; } libxl_device_disk_dispose(&disk); 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 Sun Nov 30 13:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4Sp-0006Kj-IN; Sun, 30 Nov 2014 13:22:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4So-0006KT-0C for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id C5/FA-02702-13A1B745; Sun, 30 Nov 2014 13:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1417353775!12012502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7063 invoked from network); 30 Nov 2014 13:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sl-0008Cq-9N for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Sl-0000cE-7e for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:55 +0000 Date: Sun, 30 Nov 2014 13:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] scripts/get_maintainer.pl: Correctly CC the maintainers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8342b121cd57f4bebedc7ab4be69922b07afefa5 Author: Julien Grall AuthorDate: Thu Nov 20 17:36:03 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 14:07:15 2014 +0000 scripts/get_maintainer.pl: Correctly CC the maintainers The current script is setting $email_remove_duplicates to 1 by default, on complex patch (see [1]), this will result to ommitting randomly some maintainers. This is because, the script will: 1) Get the list of maintainers of the file (incidentally all the maintainers in "THE REST" role are added). If the email address already exists in the global list, skip it. => The role will be lost 2) Filter the list to remove the entry with "THE REST" role So if a maintainers is marked with "THE REST" role on the first file and actually be an x86 maintainers on the script, the script will only retain the "THE REST" role. During the filtering step, this maintainers will therefore be dropped. This patch fixes this by setting $email_remove_duplicates to 0 by default. The new behavior of the script will be: 1) Append the list of maintainers for every file 2) Filter the list to remove the entry with "THE REST" role 3) Remove duplicated email address Example: Patch: https://patches.linaro.org/41083/ Before the patch: Daniel De Graaf Ian Jackson Stefano Stabellini Ian Campbell Wei Liu George Dunlap xen-devel@lists.xen.org After the patch: Daniel De Graaf Ian Jackson Stefano Stabellini Ian Campbell Wei Liu Stefano Stabellini Tim Deegan Keir Fraser Jan Beulich George Dunlap xen-devel@lists.xen.org [1] http://lists.xenproject.org/archives/html/xen-devel/2014-11/msg00060.html Signed-off-by: Julien Grall CC: Don Slutz Acked-by: Ian Campbell --- scripts/get_maintainer.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index df920e2..cc445cd 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -35,7 +35,7 @@ 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_remove_duplicates = 0; my $email_use_mailmap = 1; my $email_drop_the_rest_supporter_if_supporter_found = 1; my $output_multiline = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4Sp-0006Kj-IN; Sun, 30 Nov 2014 13:22:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4So-0006KT-0C for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:58 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id C5/FA-02702-13A1B745; Sun, 30 Nov 2014 13:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1417353775!12012502!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7063 invoked from network); 30 Nov 2014 13:22:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sl-0008Cq-9N for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Sl-0000cE-7e for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:22:55 +0000 Date: Sun, 30 Nov 2014 13:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] scripts/get_maintainer.pl: Correctly CC the maintainers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8342b121cd57f4bebedc7ab4be69922b07afefa5 Author: Julien Grall AuthorDate: Thu Nov 20 17:36:03 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 14:07:15 2014 +0000 scripts/get_maintainer.pl: Correctly CC the maintainers The current script is setting $email_remove_duplicates to 1 by default, on complex patch (see [1]), this will result to ommitting randomly some maintainers. This is because, the script will: 1) Get the list of maintainers of the file (incidentally all the maintainers in "THE REST" role are added). If the email address already exists in the global list, skip it. => The role will be lost 2) Filter the list to remove the entry with "THE REST" role So if a maintainers is marked with "THE REST" role on the first file and actually be an x86 maintainers on the script, the script will only retain the "THE REST" role. During the filtering step, this maintainers will therefore be dropped. This patch fixes this by setting $email_remove_duplicates to 0 by default. The new behavior of the script will be: 1) Append the list of maintainers for every file 2) Filter the list to remove the entry with "THE REST" role 3) Remove duplicated email address Example: Patch: https://patches.linaro.org/41083/ Before the patch: Daniel De Graaf Ian Jackson Stefano Stabellini Ian Campbell Wei Liu George Dunlap xen-devel@lists.xen.org After the patch: Daniel De Graaf Ian Jackson Stefano Stabellini Ian Campbell Wei Liu Stefano Stabellini Tim Deegan Keir Fraser Jan Beulich George Dunlap xen-devel@lists.xen.org [1] http://lists.xenproject.org/archives/html/xen-devel/2014-11/msg00060.html Signed-off-by: Julien Grall CC: Don Slutz Acked-by: Ian Campbell --- scripts/get_maintainer.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl index df920e2..cc445cd 100755 --- a/scripts/get_maintainer.pl +++ b/scripts/get_maintainer.pl @@ -35,7 +35,7 @@ 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_remove_duplicates = 0; my $email_use_mailmap = 1; my $email_drop_the_rest_supporter_if_supporter_found = 1; my $output_multiline = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:23:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4T0-0006NF-ON; Sun, 30 Nov 2014 13:23:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sz-0006Mm-20 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:09 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 3F/A1-24859-B3A1B745; Sun, 30 Nov 2014 13:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1417353785!14762469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19143 invoked from network); 30 Nov 2014 13:23:06 -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; 30 Nov 2014 13:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sv-0008DN-EZ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Sv-0000cq-D3 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:05 +0000 Date: Sun, 30 Nov 2014 13:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: clear UIE on hypervisor 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 31180f87e4f7f63e3bca029b4a60978f57eb0331 Author: Stefano Stabellini AuthorDate: Fri Nov 21 14:31:30 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 14:08:01 2014 +0000 xen/arm: clear UIE on hypervisor entry UIE being set can cause maintenance interrupts to occur when Xen writes to one or more LR registers. The effect is a busy loop around the interrupt handler in Xen (http://marc.info/?l=xen-devel&m=141597517132682): everything gets stuck. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Reported-and-Tested-by: Andrii Tseglytskyi Tested-by: Julien Grall Release-acked-by: Konrad Rzeszutek Wilk --- xen/arch/arm/gic.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 70d10d6..e7a1af5 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -403,6 +403,8 @@ void gic_clear_lrs(struct vcpu *v) if ( is_idle_vcpu(v) ) return; + gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 0); + spin_lock_irqsave(&v->arch.vgic.lock, flags); while ((i = find_next_bit((const unsigned long *) &this_cpu(lr_mask), @@ -527,8 +529,6 @@ void gic_inject(void) if ( !list_empty(¤t->arch.vgic.lr_pending) && lr_all_full() ) gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 1); - else - gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 0); } static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) @@ -598,6 +598,11 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r * Receiving the interrupt is going to cause gic_inject to be called * on return to guest that is going to clear the old LRs and inject * new interrupts. + * + * Do not add code here: maintenance interrupts caused by setting + * GICH_HCR_UIE, might read as spurious interrupts (1023) because + * GICH_HCR_UIE is cleared before reading GICC_IAR. As a consequence + * this handler is not called. */ } -- generated by git-patchbot for /home/xen/git/xen.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 30 13:23:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4T0-0006NF-ON; Sun, 30 Nov 2014 13:23:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sz-0006Mm-20 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:09 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 3F/A1-24859-B3A1B745; Sun, 30 Nov 2014 13:23:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1417353785!14762469!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19143 invoked from network); 30 Nov 2014 13:23:06 -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; 30 Nov 2014 13:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Sv-0008DN-EZ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Sv-0000cq-D3 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:05 +0000 Date: Sun, 30 Nov 2014 13:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: clear UIE on hypervisor 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 31180f87e4f7f63e3bca029b4a60978f57eb0331 Author: Stefano Stabellini AuthorDate: Fri Nov 21 14:31:30 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 14:08:01 2014 +0000 xen/arm: clear UIE on hypervisor entry UIE being set can cause maintenance interrupts to occur when Xen writes to one or more LR registers. The effect is a busy loop around the interrupt handler in Xen (http://marc.info/?l=xen-devel&m=141597517132682): everything gets stuck. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Reported-and-Tested-by: Andrii Tseglytskyi Tested-by: Julien Grall Release-acked-by: Konrad Rzeszutek Wilk --- xen/arch/arm/gic.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 70d10d6..e7a1af5 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -403,6 +403,8 @@ void gic_clear_lrs(struct vcpu *v) if ( is_idle_vcpu(v) ) return; + gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 0); + spin_lock_irqsave(&v->arch.vgic.lock, flags); while ((i = find_next_bit((const unsigned long *) &this_cpu(lr_mask), @@ -527,8 +529,6 @@ void gic_inject(void) if ( !list_empty(¤t->arch.vgic.lr_pending) && lr_all_full() ) gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 1); - else - gic_hw_ops->update_hcr_status(GICH_HCR_UIE, 0); } static void do_sgi(struct cpu_user_regs *regs, enum gic_sgi sgi) @@ -598,6 +598,11 @@ static void maintenance_interrupt(int irq, void *dev_id, struct cpu_user_regs *r * Receiving the interrupt is going to cause gic_inject to be called * on return to guest that is going to clear the old LRs and inject * new interrupts. + * + * Do not add code here: maintenance interrupts caused by setting + * GICH_HCR_UIE, might read as spurious interrupts (1023) because + * GICH_HCR_UIE is cleared before reading GICC_IAR. As a consequence + * this handler is not called. */ } -- generated by git-patchbot for /home/xen/git/xen.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 30 13:23:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4T9-0006Oy-Qr; Sun, 30 Nov 2014 13:23:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4T8-0006OX-E0 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:18 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id D9/CA-27623-54A1B745; Sun, 30 Nov 2014 13:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1417353796!10370100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25636 invoked from network); 30 Nov 2014 13:23:17 -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; 30 Nov 2014 13:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4T5-0008DV-Ps for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4T5-0000dO-N7 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:15 +0000 Date: Sun, 30 Nov 2014 13:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Support the other 4 PCI buses on Xgene X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d17405f8153f7419db680a183f10129410feca05 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:15 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 15:03:44 2014 +0000 xen: arm: Support the other 4 PCI buses on Xgene Currently we only establish specific mappings for pcie0, which is used on the Mustang platform. However at least McDivitt uses pcie3. So wire up all the others, based on whether the corresponding DT node is marked as available. This results in no change for Mustang. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Acked-by: Pranavkumar Sawargaonkar --- xen/arch/arm/platforms/xgene-storm.c | 89 +++++++++++++++++++++++++++++----- 1 files changed, 76 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 8c27f24..0b3492d 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -78,35 +78,35 @@ static int map_one_spi(struct domain *d, const char *what, return ret; } -/* - * Xen does not currently support mapping MMIO regions and interrupt - * for bus child devices (referenced via the "ranges" and - * "interrupt-map" properties to domain 0). Instead for now map the - * necessary resources manually. - */ -static int xgene_storm_specific_mapping(struct domain *d) +/* Creates MMIO mappings base..end as well as 4 SPIs from the given base. */ +static int xgene_storm_pcie_specific_mapping(struct domain *d, + const struct dt_device_node *node, + paddr_t base, paddr_t end, + int base_spi) { int ret; + printk("Mapping additional regions for PCIe device %s\n", + dt_node_full_name(node)); + /* Map the PCIe bus resources */ - ret = map_one_mmio(d, "PCI MEMORY", paddr_to_pfn(0x0e000000000UL), - paddr_to_pfn(0x01000000000UL)); + ret = map_one_mmio(d, "PCI MEMORY", paddr_to_pfn(base), paddr_to_pfn(end)); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTA", 0xc2, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTA", base_spi+0, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTB", 0xc3, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTB", base_spi+1, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTC", 0xc4, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTC", base_spi+2, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTD", 0xc5, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTD", base_spi+3, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; @@ -115,6 +115,69 @@ err: return ret; } +/* + * Xen does not currently support mapping MMIO regions and interrupt + * for bus child devices (referenced via the "ranges" and + * "interrupt-map" properties to domain 0). Instead for now map the + * necessary resources manually. + */ +static int xgene_storm_specific_mapping(struct domain *d) +{ + struct dt_device_node *node = NULL; + int ret; + + while ( (node = dt_find_compatible_node(node, "pci", "apm,xgene-pcie")) ) + { + u64 addr; + + /* Identify the bus via it's control register address */ + ret = dt_device_get_address(node, 0, &addr, NULL); + if ( ret < 0 ) + return ret; + + if ( !dt_device_is_available(node) ) + continue; + + switch ( addr ) + { + case 0x1f2b0000: /* PCIe0 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0e000000000UL, 0x10000000000UL, 0xc2); + break; + case 0x1f2c0000: /* PCIe1 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0d000000000UL, 0x0e000000000UL, 0xc8); + break; + case 0x1f2d0000: /* PCIe2 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x09000000000UL, 0x0a000000000UL, 0xce); + break; + case 0x1f500000: /* PCIe3 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0a000000000UL, 0x0c000000000UL, 0xd4); + break; + case 0x1f510000: /* PCIe4 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0c000000000UL, 0x0d000000000UL, 0xda); + break; + + default: + printk("Ignoring unknown PCI bus %s\n", dt_node_full_name(node)); + continue; + } + + if ( ret < 0 ) + return ret; + } + + return 0; +} + static void xgene_storm_reset(void) { void __iomem *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 Sun Nov 30 13:23:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4T9-0006Oy-Qr; Sun, 30 Nov 2014 13:23:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4T8-0006OX-E0 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:18 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id D9/CA-27623-54A1B745; Sun, 30 Nov 2014 13:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1417353796!10370100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25636 invoked from network); 30 Nov 2014 13:23:17 -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; 30 Nov 2014 13:23:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4T5-0008DV-Ps for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4T5-0000dO-N7 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:15 +0000 Date: Sun, 30 Nov 2014 13:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Support the other 4 PCI buses on Xgene X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d17405f8153f7419db680a183f10129410feca05 Author: Ian Campbell AuthorDate: Wed Nov 19 15:28:15 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 15:03:44 2014 +0000 xen: arm: Support the other 4 PCI buses on Xgene Currently we only establish specific mappings for pcie0, which is used on the Mustang platform. However at least McDivitt uses pcie3. So wire up all the others, based on whether the corresponding DT node is marked as available. This results in no change for Mustang. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Acked-by: Pranavkumar Sawargaonkar --- xen/arch/arm/platforms/xgene-storm.c | 89 +++++++++++++++++++++++++++++----- 1 files changed, 76 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/platforms/xgene-storm.c b/xen/arch/arm/platforms/xgene-storm.c index 8c27f24..0b3492d 100644 --- a/xen/arch/arm/platforms/xgene-storm.c +++ b/xen/arch/arm/platforms/xgene-storm.c @@ -78,35 +78,35 @@ static int map_one_spi(struct domain *d, const char *what, return ret; } -/* - * Xen does not currently support mapping MMIO regions and interrupt - * for bus child devices (referenced via the "ranges" and - * "interrupt-map" properties to domain 0). Instead for now map the - * necessary resources manually. - */ -static int xgene_storm_specific_mapping(struct domain *d) +/* Creates MMIO mappings base..end as well as 4 SPIs from the given base. */ +static int xgene_storm_pcie_specific_mapping(struct domain *d, + const struct dt_device_node *node, + paddr_t base, paddr_t end, + int base_spi) { int ret; + printk("Mapping additional regions for PCIe device %s\n", + dt_node_full_name(node)); + /* Map the PCIe bus resources */ - ret = map_one_mmio(d, "PCI MEMORY", paddr_to_pfn(0x0e000000000UL), - paddr_to_pfn(0x01000000000UL)); + ret = map_one_mmio(d, "PCI MEMORY", paddr_to_pfn(base), paddr_to_pfn(end)); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTA", 0xc2, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTA", base_spi+0, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTB", 0xc3, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTB", base_spi+1, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTC", 0xc4, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTC", base_spi+2, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; - ret = map_one_spi(d, "PCI#INTD", 0xc5, DT_IRQ_TYPE_LEVEL_HIGH); + ret = map_one_spi(d, "PCI#INTD", base_spi+3, DT_IRQ_TYPE_LEVEL_HIGH); if ( ret ) goto err; @@ -115,6 +115,69 @@ err: return ret; } +/* + * Xen does not currently support mapping MMIO regions and interrupt + * for bus child devices (referenced via the "ranges" and + * "interrupt-map" properties to domain 0). Instead for now map the + * necessary resources manually. + */ +static int xgene_storm_specific_mapping(struct domain *d) +{ + struct dt_device_node *node = NULL; + int ret; + + while ( (node = dt_find_compatible_node(node, "pci", "apm,xgene-pcie")) ) + { + u64 addr; + + /* Identify the bus via it's control register address */ + ret = dt_device_get_address(node, 0, &addr, NULL); + if ( ret < 0 ) + return ret; + + if ( !dt_device_is_available(node) ) + continue; + + switch ( addr ) + { + case 0x1f2b0000: /* PCIe0 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0e000000000UL, 0x10000000000UL, 0xc2); + break; + case 0x1f2c0000: /* PCIe1 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0d000000000UL, 0x0e000000000UL, 0xc8); + break; + case 0x1f2d0000: /* PCIe2 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x09000000000UL, 0x0a000000000UL, 0xce); + break; + case 0x1f500000: /* PCIe3 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0a000000000UL, 0x0c000000000UL, 0xd4); + break; + case 0x1f510000: /* PCIe4 */ + ret = xgene_storm_pcie_specific_mapping(d, + node, + 0x0c000000000UL, 0x0d000000000UL, 0xda); + break; + + default: + printk("Ignoring unknown PCI bus %s\n", dt_node_full_name(node)); + continue; + } + + if ( ret < 0 ) + return ret; + } + + return 0; +} + static void xgene_storm_reset(void) { void __iomem *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 Sun Nov 30 13:23:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TK-0006Qu-Ty; Sun, 30 Nov 2014 13:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TI-0006Qc-RN for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:29 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 20/2B-02702-05A1B745; Sun, 30 Nov 2014 13:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1417353806!8669672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32515 invoked from network); 30 Nov 2014 13:23: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; 30 Nov 2014 13:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TF-0008Db-W1 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4TF-0000e1-Tc for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:25 +0000 Date: Sun, 30 Nov 2014 13:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't leak buffer containing the uncompressed PV kernel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8f4023dd7d77de7b2c1af77e86637202a33f948a Author: Ian Campbell AuthorDate: Thu Nov 20 15:48:47 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 15:53:53 2014 +0000 libxc: don't leak buffer containing the uncompressed PV kernel The libxc xc_dom_* infrastructure uses a very simple malloc memory pool which is freed by xc_dom_release. However the various xc_try_*_decode routines (other than the gzip one) just use plain malloc/realloc and therefore the buffer ends up leaked. The memory pool currently supports mmap'd buffers as well as a directly allocated buffers, however the try decode routines make use of realloc and do not fit well into this model. Introduce a concept of an external memory block to the memory pool and provide an interface to register such memory. The mmap_ptr and mmap_len fields of the memblock tracking struct lose their mmap_ prefix since they are now also used for external memory blocks. We are only seeing this now because the gzip decoder doesn't leak and it's only relatively recently that kernels in the wild have switched to better compression. This is https://bugs.debian.org/767295 Reported by: Gedalya Signed-off-by: Ian Campbell Reviewed-by: Wei Liu --- tools/libxc/include/xc_dom.h | 10 ++++- tools/libxc/xc_dom_bzimageloader.c | 20 +++++++++++ tools/libxc/xc_dom_core.c | 61 +++++++++++++++++++++++++++-------- tools/libxc/xc_dom_decompress_lz4.c | 5 +++ 4 files changed, 80 insertions(+), 16 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 6ae6a9f..07d7224 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -33,8 +33,13 @@ struct xc_dom_seg { struct xc_dom_mem { struct xc_dom_mem *next; - void *mmap_ptr; - size_t mmap_len; + void *ptr; + enum { + XC_DOM_MEM_TYPE_MALLOC_INTERNAL, + XC_DOM_MEM_TYPE_MALLOC_EXTERNAL, + XC_DOM_MEM_TYPE_MMAP, + } type; + size_t len; unsigned char memory[0]; }; @@ -298,6 +303,7 @@ void xc_dom_log_memory_footprint(struct xc_dom_image *dom); /* --- simple memory pool ------------------------------------------ */ void *xc_dom_malloc(struct xc_dom_image *dom, size_t size); +int xc_dom_register_external(struct xc_dom_image *dom, void *ptr, size_t size); void *xc_dom_malloc_page_aligned(struct xc_dom_image *dom, size_t size); void *xc_dom_malloc_filemap(struct xc_dom_image *dom, const char *filename, size_t * size, diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 2225699..964ebdc 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -161,6 +161,13 @@ static int xc_try_bzip2_decode( total = (((uint64_t)stream.total_out_hi32) << 32) | stream.total_out_lo32; + if ( xc_dom_register_external(dom, out_buf, total) ) + { + DOMPRINTF("BZIP2: Error registering stream output"); + free(out_buf); + goto bzip2_cleanup; + } + DOMPRINTF("%s: BZIP2 decompress OK, 0x%zx -> 0x%lx", __FUNCTION__, *size, (long unsigned int) total); @@ -305,6 +312,13 @@ static int _xc_try_lzma_decode( } } + if ( xc_dom_register_external(dom, out_buf, stream->total_out) ) + { + DOMPRINTF("%s: Error registering stream output", what); + free(out_buf); + goto lzma_cleanup; + } + DOMPRINTF("%s: %s decompress OK, 0x%zx -> 0x%zx", __FUNCTION__, what, *size, (size_t)stream->total_out); @@ -464,7 +478,13 @@ static int xc_try_lzo1x_decode( dst_len = lzo_read_32(cur); if ( !dst_len ) + { + msg = "Error registering stream output"; + if ( xc_dom_register_external(dom, out_buf, out_len) ) + break; + return 0; + } if ( dst_len > LZOP_MAX_BLOCK_SIZE ) { diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index baa62a1..ecbf981 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -132,6 +132,7 @@ void *xc_dom_malloc(struct xc_dom_image *dom, size_t size) return NULL; } memset(block, 0, sizeof(*block) + size); + block->type = XC_DOM_MEM_TYPE_MALLOC_INTERNAL; block->next = dom->memblocks; dom->memblocks = block; dom->alloc_malloc += sizeof(*block) + size; @@ -151,23 +152,45 @@ void *xc_dom_malloc_page_aligned(struct xc_dom_image *dom, size_t size) return NULL; } memset(block, 0, sizeof(*block)); - block->mmap_len = size; - block->mmap_ptr = mmap(NULL, block->mmap_len, - PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, - -1, 0); - if ( block->mmap_ptr == MAP_FAILED ) + block->len = size; + block->ptr = mmap(NULL, block->len, + PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, + -1, 0); + if ( block->ptr == MAP_FAILED ) { DOMPRINTF("%s: mmap failed", __FUNCTION__); free(block); return NULL; } + block->type = XC_DOM_MEM_TYPE_MMAP; block->next = dom->memblocks; dom->memblocks = block; dom->alloc_malloc += sizeof(*block); - dom->alloc_mem_map += block->mmap_len; + dom->alloc_mem_map += block->len; if ( size > (100 * 1024) ) print_mem(dom, __FUNCTION__, size); - return block->mmap_ptr; + return block->ptr; +} + +int xc_dom_register_external(struct xc_dom_image *dom, void *ptr, size_t size) +{ + struct xc_dom_mem *block; + + block = malloc(sizeof(*block)); + if ( block == NULL ) + { + DOMPRINTF("%s: allocation failed", __FUNCTION__); + return -1; + } + memset(block, 0, sizeof(*block)); + block->ptr = ptr; + block->len = size; + block->type = XC_DOM_MEM_TYPE_MALLOC_EXTERNAL; + block->next = dom->memblocks; + dom->memblocks = block; + dom->alloc_malloc += sizeof(*block); + dom->alloc_mem_map += block->len; + return 0; } void *xc_dom_malloc_filemap(struct xc_dom_image *dom, @@ -212,24 +235,25 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, } memset(block, 0, sizeof(*block)); - block->mmap_len = *size; - block->mmap_ptr = mmap(NULL, block->mmap_len, PROT_READ, + block->len = *size; + block->ptr = mmap(NULL, block->len, PROT_READ, MAP_SHARED, fd, 0); - if ( block->mmap_ptr == MAP_FAILED ) { + if ( block->ptr == MAP_FAILED ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, "failed to mmap file: %s", strerror(errno)); goto err; } + block->type = XC_DOM_MEM_TYPE_MMAP; block->next = dom->memblocks; dom->memblocks = block; dom->alloc_malloc += sizeof(*block); - dom->alloc_file_map += block->mmap_len; + dom->alloc_file_map += block->len; close(fd); if ( *size > (100 * 1024) ) print_mem(dom, __FUNCTION__, *size); - return block->mmap_ptr; + return block->ptr; err: if ( fd != -1 ) @@ -246,8 +270,17 @@ static void xc_dom_free_all(struct xc_dom_image *dom) while ( (block = dom->memblocks) != NULL ) { dom->memblocks = block->next; - if ( block->mmap_ptr ) - munmap(block->mmap_ptr, block->mmap_len); + switch ( block->type ) + { + case XC_DOM_MEM_TYPE_MALLOC_INTERNAL: + break; + case XC_DOM_MEM_TYPE_MALLOC_EXTERNAL: + free(block->ptr); + break; + case XC_DOM_MEM_TYPE_MMAP: + munmap(block->ptr, block->len); + break; + } free(block); } } diff --git a/tools/libxc/xc_dom_decompress_lz4.c b/tools/libxc/xc_dom_decompress_lz4.c index 490ec56..b6a33f2 100644 --- a/tools/libxc/xc_dom_decompress_lz4.c +++ b/tools/libxc/xc_dom_decompress_lz4.c @@ -103,6 +103,11 @@ int xc_try_lz4_decode( if (size == 0) { + if ( xc_dom_register_external(dom, output, out_len) ) + { + msg = "Error registering stream output"; + goto exit_2; + } *blob = output; *psize = out_len; return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:23:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:23:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TK-0006Qu-Ty; Sun, 30 Nov 2014 13:23:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TI-0006Qc-RN for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:29 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 20/2B-02702-05A1B745; Sun, 30 Nov 2014 13:23:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1417353806!8669672!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32515 invoked from network); 30 Nov 2014 13:23: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; 30 Nov 2014 13:23:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TF-0008Db-W1 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4TF-0000e1-Tc for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:25 +0000 Date: Sun, 30 Nov 2014 13:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't leak buffer containing the uncompressed PV kernel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8f4023dd7d77de7b2c1af77e86637202a33f948a Author: Ian Campbell AuthorDate: Thu Nov 20 15:48:47 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 15:53:53 2014 +0000 libxc: don't leak buffer containing the uncompressed PV kernel The libxc xc_dom_* infrastructure uses a very simple malloc memory pool which is freed by xc_dom_release. However the various xc_try_*_decode routines (other than the gzip one) just use plain malloc/realloc and therefore the buffer ends up leaked. The memory pool currently supports mmap'd buffers as well as a directly allocated buffers, however the try decode routines make use of realloc and do not fit well into this model. Introduce a concept of an external memory block to the memory pool and provide an interface to register such memory. The mmap_ptr and mmap_len fields of the memblock tracking struct lose their mmap_ prefix since they are now also used for external memory blocks. We are only seeing this now because the gzip decoder doesn't leak and it's only relatively recently that kernels in the wild have switched to better compression. This is https://bugs.debian.org/767295 Reported by: Gedalya Signed-off-by: Ian Campbell Reviewed-by: Wei Liu --- tools/libxc/include/xc_dom.h | 10 ++++- tools/libxc/xc_dom_bzimageloader.c | 20 +++++++++++ tools/libxc/xc_dom_core.c | 61 +++++++++++++++++++++++++++-------- tools/libxc/xc_dom_decompress_lz4.c | 5 +++ 4 files changed, 80 insertions(+), 16 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 6ae6a9f..07d7224 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -33,8 +33,13 @@ struct xc_dom_seg { struct xc_dom_mem { struct xc_dom_mem *next; - void *mmap_ptr; - size_t mmap_len; + void *ptr; + enum { + XC_DOM_MEM_TYPE_MALLOC_INTERNAL, + XC_DOM_MEM_TYPE_MALLOC_EXTERNAL, + XC_DOM_MEM_TYPE_MMAP, + } type; + size_t len; unsigned char memory[0]; }; @@ -298,6 +303,7 @@ void xc_dom_log_memory_footprint(struct xc_dom_image *dom); /* --- simple memory pool ------------------------------------------ */ void *xc_dom_malloc(struct xc_dom_image *dom, size_t size); +int xc_dom_register_external(struct xc_dom_image *dom, void *ptr, size_t size); void *xc_dom_malloc_page_aligned(struct xc_dom_image *dom, size_t size); void *xc_dom_malloc_filemap(struct xc_dom_image *dom, const char *filename, size_t * size, diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 2225699..964ebdc 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -161,6 +161,13 @@ static int xc_try_bzip2_decode( total = (((uint64_t)stream.total_out_hi32) << 32) | stream.total_out_lo32; + if ( xc_dom_register_external(dom, out_buf, total) ) + { + DOMPRINTF("BZIP2: Error registering stream output"); + free(out_buf); + goto bzip2_cleanup; + } + DOMPRINTF("%s: BZIP2 decompress OK, 0x%zx -> 0x%lx", __FUNCTION__, *size, (long unsigned int) total); @@ -305,6 +312,13 @@ static int _xc_try_lzma_decode( } } + if ( xc_dom_register_external(dom, out_buf, stream->total_out) ) + { + DOMPRINTF("%s: Error registering stream output", what); + free(out_buf); + goto lzma_cleanup; + } + DOMPRINTF("%s: %s decompress OK, 0x%zx -> 0x%zx", __FUNCTION__, what, *size, (size_t)stream->total_out); @@ -464,7 +478,13 @@ static int xc_try_lzo1x_decode( dst_len = lzo_read_32(cur); if ( !dst_len ) + { + msg = "Error registering stream output"; + if ( xc_dom_register_external(dom, out_buf, out_len) ) + break; + return 0; + } if ( dst_len > LZOP_MAX_BLOCK_SIZE ) { diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index baa62a1..ecbf981 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -132,6 +132,7 @@ void *xc_dom_malloc(struct xc_dom_image *dom, size_t size) return NULL; } memset(block, 0, sizeof(*block) + size); + block->type = XC_DOM_MEM_TYPE_MALLOC_INTERNAL; block->next = dom->memblocks; dom->memblocks = block; dom->alloc_malloc += sizeof(*block) + size; @@ -151,23 +152,45 @@ void *xc_dom_malloc_page_aligned(struct xc_dom_image *dom, size_t size) return NULL; } memset(block, 0, sizeof(*block)); - block->mmap_len = size; - block->mmap_ptr = mmap(NULL, block->mmap_len, - PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, - -1, 0); - if ( block->mmap_ptr == MAP_FAILED ) + block->len = size; + block->ptr = mmap(NULL, block->len, + PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, + -1, 0); + if ( block->ptr == MAP_FAILED ) { DOMPRINTF("%s: mmap failed", __FUNCTION__); free(block); return NULL; } + block->type = XC_DOM_MEM_TYPE_MMAP; block->next = dom->memblocks; dom->memblocks = block; dom->alloc_malloc += sizeof(*block); - dom->alloc_mem_map += block->mmap_len; + dom->alloc_mem_map += block->len; if ( size > (100 * 1024) ) print_mem(dom, __FUNCTION__, size); - return block->mmap_ptr; + return block->ptr; +} + +int xc_dom_register_external(struct xc_dom_image *dom, void *ptr, size_t size) +{ + struct xc_dom_mem *block; + + block = malloc(sizeof(*block)); + if ( block == NULL ) + { + DOMPRINTF("%s: allocation failed", __FUNCTION__); + return -1; + } + memset(block, 0, sizeof(*block)); + block->ptr = ptr; + block->len = size; + block->type = XC_DOM_MEM_TYPE_MALLOC_EXTERNAL; + block->next = dom->memblocks; + dom->memblocks = block; + dom->alloc_malloc += sizeof(*block); + dom->alloc_mem_map += block->len; + return 0; } void *xc_dom_malloc_filemap(struct xc_dom_image *dom, @@ -212,24 +235,25 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, } memset(block, 0, sizeof(*block)); - block->mmap_len = *size; - block->mmap_ptr = mmap(NULL, block->mmap_len, PROT_READ, + block->len = *size; + block->ptr = mmap(NULL, block->len, PROT_READ, MAP_SHARED, fd, 0); - if ( block->mmap_ptr == MAP_FAILED ) { + if ( block->ptr == MAP_FAILED ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, "failed to mmap file: %s", strerror(errno)); goto err; } + block->type = XC_DOM_MEM_TYPE_MMAP; block->next = dom->memblocks; dom->memblocks = block; dom->alloc_malloc += sizeof(*block); - dom->alloc_file_map += block->mmap_len; + dom->alloc_file_map += block->len; close(fd); if ( *size > (100 * 1024) ) print_mem(dom, __FUNCTION__, *size); - return block->mmap_ptr; + return block->ptr; err: if ( fd != -1 ) @@ -246,8 +270,17 @@ static void xc_dom_free_all(struct xc_dom_image *dom) while ( (block = dom->memblocks) != NULL ) { dom->memblocks = block->next; - if ( block->mmap_ptr ) - munmap(block->mmap_ptr, block->mmap_len); + switch ( block->type ) + { + case XC_DOM_MEM_TYPE_MALLOC_INTERNAL: + break; + case XC_DOM_MEM_TYPE_MALLOC_EXTERNAL: + free(block->ptr); + break; + case XC_DOM_MEM_TYPE_MMAP: + munmap(block->ptr, block->len); + break; + } free(block); } } diff --git a/tools/libxc/xc_dom_decompress_lz4.c b/tools/libxc/xc_dom_decompress_lz4.c index 490ec56..b6a33f2 100644 --- a/tools/libxc/xc_dom_decompress_lz4.c +++ b/tools/libxc/xc_dom_decompress_lz4.c @@ -103,6 +103,11 @@ int xc_try_lz4_decode( if (size == 0) { + if ( xc_dom_register_external(dom, output, out_len) ) + { + msg = "Error registering stream output"; + goto exit_2; + } *blob = output; *psize = out_len; return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:23:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:23:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TV-0006SY-0M; Sun, 30 Nov 2014 13:23:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TS-0006SB-PT for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:38 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 8D/53-09842-A5A1B745; Sun, 30 Nov 2014 13:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1417353816!12388361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13701 invoked from network); 30 Nov 2014 13:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TQ-0008Dj-DJ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4TQ-0000ee-BE for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:36 +0000 Date: Sun, 30 Nov 2014 13:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vNUMA: rename interface structures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13f72e92a32380e94cb0c86725a1b38a6d191461 Author: Jan Beulich AuthorDate: Tue Nov 25 17:21:52 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 17:21:52 2014 +0100 vNUMA: rename interface structures No-one (including me) paid attention during review that these structures don't adhere to the naming requirements of the public interface: Consistently use xen_ prefixes at least for all new additions. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_domain.c | 2 +- xen/common/domctl.c | 2 +- xen/common/memory.c | 4 ++-- xen/include/public/domctl.h | 2 +- xen/include/public/memory.h | 15 +++++++-------- xen/include/xen/domain.h | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 45e282c..0ad8b8d 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1264,7 +1264,7 @@ int xc_domain_setvnuma(xc_interface *xch, uint32_t nr_vnodes, uint32_t nr_regions, uint32_t nr_vcpus, - vmemrange_t *vmemrange, + xen_vmemrange_t *vmemrange, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index b071dea..b864872 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2171,7 +2171,7 @@ int xc_domain_setvnuma(xc_interface *xch, uint32_t nr_vnodes, uint32_t nr_vmemranges, uint32_t nr_vcpus, - vmemrange_t *vmemrange, + xen_vmemrange_t *vmemrange, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index d9c2635..f15dcfe 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(unsigned int nr_vnodes, vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes); vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus); vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes); - vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges); + vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges); if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL || vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL ) diff --git a/xen/common/memory.c b/xen/common/memory.c index cc36e39..9f21bd3 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENMEM_get_vnumainfo: { - struct vnuma_topology_info topology; + struct xen_vnuma_topology_info topology; struct domain *d; unsigned int dom_vnodes, dom_vranges, dom_vcpus; struct vnuma_info tmp; @@ -1033,7 +1033,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) read_unlock(&d->vnuma_rwlock); tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes * dom_vnodes); - tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges); + tmp.vmemrange = xmalloc_array(xen_vmemrange_t, dom_vranges); tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus); if ( tmp.vdistance == NULL || diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 8da204e..57e2ed7 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -980,7 +980,7 @@ struct xen_domctl_vnuma { /* * memory rages for each vNUMA node */ - XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange; + XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange; }; typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index f021958..595f953 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); #define XENMEM_get_vnumainfo 26 /* vNUMA node memory ranges */ -struct vmemrange { +struct xen_vmemrange { uint64_t start, end; unsigned int flags; unsigned int nid; }; - -typedef struct vmemrange vmemrange_t; -DEFINE_XEN_GUEST_HANDLE(vmemrange_t); +typedef struct xen_vmemrange xen_vmemrange_t; +DEFINE_XEN_GUEST_HANDLE(xen_vmemrange_t); /* * vNUMA topology specifies vNUMA node number, distance table, @@ -548,7 +547,7 @@ DEFINE_XEN_GUEST_HANDLE(vmemrange_t); * copied back to guest. Domain returns expected values of nr_vnodes, * nr_vmemranges and nr_vcpus to guest if the values where incorrect. */ -struct vnuma_topology_info { +struct xen_vnuma_topology_info { /* IN */ domid_t domid; uint16_t pad; @@ -566,12 +565,12 @@ struct vnuma_topology_info { uint64_t pad; } vcpu_to_vnode; union { - XEN_GUEST_HANDLE(vmemrange_t) h; + XEN_GUEST_HANDLE(xen_vmemrange_t) h; uint64_t pad; } vmemrange; }; -typedef struct vnuma_topology_info vnuma_topology_info_t; -DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t); +typedef struct xen_vnuma_topology_info xen_vnuma_topology_info_t; +DEFINE_XEN_GUEST_HANDLE(xen_vnuma_topology_info_t); /* Next available subop number is 27 */ diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 9215b0e..72667da 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -100,7 +100,7 @@ struct vnuma_info { unsigned int *vdistance; unsigned int *vcpu_to_vnode; unsigned int *vnode_to_pnode; - struct vmemrange *vmemrange; + struct xen_vmemrange *vmemrange; }; void vnuma_destroy(struct vnuma_info *vnuma); -- generated by git-patchbot for /home/xen/git/xen.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 30 13:23:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:23:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TV-0006SY-0M; Sun, 30 Nov 2014 13:23:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TS-0006SB-PT for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:38 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 8D/53-09842-A5A1B745; Sun, 30 Nov 2014 13:23:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1417353816!12388361!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13701 invoked from network); 30 Nov 2014 13:23:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:23:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4TQ-0008Dj-DJ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4TQ-0000ee-BE for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:36 +0000 Date: Sun, 30 Nov 2014 13:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vNUMA: rename interface structures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13f72e92a32380e94cb0c86725a1b38a6d191461 Author: Jan Beulich AuthorDate: Tue Nov 25 17:21:52 2014 +0100 Commit: Jan Beulich CommitDate: Tue Nov 25 17:21:52 2014 +0100 vNUMA: rename interface structures No-one (including me) paid attention during review that these structures don't adhere to the naming requirements of the public interface: Consistently use xen_ prefixes at least for all new additions. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_domain.c | 2 +- xen/common/domctl.c | 2 +- xen/common/memory.c | 4 ++-- xen/include/public/domctl.h | 2 +- xen/include/public/memory.h | 15 +++++++-------- xen/include/xen/domain.h | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 45e282c..0ad8b8d 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1264,7 +1264,7 @@ int xc_domain_setvnuma(xc_interface *xch, uint32_t nr_vnodes, uint32_t nr_regions, uint32_t nr_vcpus, - vmemrange_t *vmemrange, + xen_vmemrange_t *vmemrange, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index b071dea..b864872 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2171,7 +2171,7 @@ int xc_domain_setvnuma(xc_interface *xch, uint32_t nr_vnodes, uint32_t nr_vmemranges, uint32_t nr_vcpus, - vmemrange_t *vmemrange, + xen_vmemrange_t *vmemrange, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index d9c2635..f15dcfe 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -345,7 +345,7 @@ static struct vnuma_info *vnuma_alloc(unsigned int nr_vnodes, vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes); vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus); vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes); - vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges); + vnuma->vmemrange = xmalloc_array(xen_vmemrange_t, nr_ranges); if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL || vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL ) diff --git a/xen/common/memory.c b/xen/common/memory.c index cc36e39..9f21bd3 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -972,7 +972,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENMEM_get_vnumainfo: { - struct vnuma_topology_info topology; + struct xen_vnuma_topology_info topology; struct domain *d; unsigned int dom_vnodes, dom_vranges, dom_vcpus; struct vnuma_info tmp; @@ -1033,7 +1033,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) read_unlock(&d->vnuma_rwlock); tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes * dom_vnodes); - tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges); + tmp.vmemrange = xmalloc_array(xen_vmemrange_t, dom_vranges); tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus); if ( tmp.vdistance == NULL || diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 8da204e..57e2ed7 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -980,7 +980,7 @@ struct xen_domctl_vnuma { /* * memory rages for each vNUMA node */ - XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange; + XEN_GUEST_HANDLE_64(xen_vmemrange_t) vmemrange; }; typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index f021958..595f953 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -530,14 +530,13 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); #define XENMEM_get_vnumainfo 26 /* vNUMA node memory ranges */ -struct vmemrange { +struct xen_vmemrange { uint64_t start, end; unsigned int flags; unsigned int nid; }; - -typedef struct vmemrange vmemrange_t; -DEFINE_XEN_GUEST_HANDLE(vmemrange_t); +typedef struct xen_vmemrange xen_vmemrange_t; +DEFINE_XEN_GUEST_HANDLE(xen_vmemrange_t); /* * vNUMA topology specifies vNUMA node number, distance table, @@ -548,7 +547,7 @@ DEFINE_XEN_GUEST_HANDLE(vmemrange_t); * copied back to guest. Domain returns expected values of nr_vnodes, * nr_vmemranges and nr_vcpus to guest if the values where incorrect. */ -struct vnuma_topology_info { +struct xen_vnuma_topology_info { /* IN */ domid_t domid; uint16_t pad; @@ -566,12 +565,12 @@ struct vnuma_topology_info { uint64_t pad; } vcpu_to_vnode; union { - XEN_GUEST_HANDLE(vmemrange_t) h; + XEN_GUEST_HANDLE(xen_vmemrange_t) h; uint64_t pad; } vmemrange; }; -typedef struct vnuma_topology_info vnuma_topology_info_t; -DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t); +typedef struct xen_vnuma_topology_info xen_vnuma_topology_info_t; +DEFINE_XEN_GUEST_HANDLE(xen_vnuma_topology_info_t); /* Next available subop number is 27 */ diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 9215b0e..72667da 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -100,7 +100,7 @@ struct vnuma_info { unsigned int *vdistance; unsigned int *vcpu_to_vnode; unsigned int *vnode_to_pnode; - struct vmemrange *vmemrange; + struct xen_vmemrange *vmemrange; }; void vnuma_destroy(struct vnuma_info *vnuma); -- generated by git-patchbot for /home/xen/git/xen.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 30 13:23:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4Te-0006UR-5L; Sun, 30 Nov 2014 13:23:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Td-0006UD-5Y for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:49 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 52/BE-26858-46A1B745; Sun, 30 Nov 2014 13:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1417353826!11056775!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10565 invoked from network); 30 Nov 2014 13:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ta-0008Dp-Ia for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Ta-0000f7-Gy for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:46 +0000 Date: Sun, 30 Nov 2014 13:23:46 +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 d85728a3c5e112383e99fc23825fd238a4fb8c63 Merge: 8f4023dd7d77de7b2c1af77e86637202a33f948a 13f72e92a32380e94cb0c86725a1b38a6d191461 Author: Ian Campbell AuthorDate: Tue Nov 25 16:24:19 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 16:24:19 2014 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_domain.c | 2 +- xen/common/domctl.c | 2 +- xen/common/memory.c | 4 ++-- xen/include/public/domctl.h | 2 +- xen/include/public/memory.h | 15 +++++++-------- xen/include/xen/domain.h | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:23:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13: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 1Xv4Te-0006UR-5L; Sun, 30 Nov 2014 13:23:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Td-0006UD-5Y for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:49 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 52/BE-26858-46A1B745; Sun, 30 Nov 2014 13:23:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1417353826!11056775!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10565 invoked from network); 30 Nov 2014 13:23:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:23:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ta-0008Dp-Ia for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Ta-0000f7-Gy for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:46 +0000 Date: Sun, 30 Nov 2014 13:23:46 +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 d85728a3c5e112383e99fc23825fd238a4fb8c63 Merge: 8f4023dd7d77de7b2c1af77e86637202a33f948a 13f72e92a32380e94cb0c86725a1b38a6d191461 Author: Ian Campbell AuthorDate: Tue Nov 25 16:24:19 2014 +0000 Commit: Ian Campbell CommitDate: Tue Nov 25 16:24:19 2014 +0000 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_domain.c | 2 +- xen/common/domctl.c | 2 +- xen/common/memory.c | 4 ++-- xen/include/public/domctl.h | 2 +- xen/include/public/memory.h | 15 +++++++-------- xen/include/xen/domain.h | 2 +- 7 files changed, 14 insertions(+), 15 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:24:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4To-0006W1-8O; Sun, 30 Nov 2014 13:24:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tn-0006Vp-5i for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:59 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id AB/74-25276-E6A1B745; Sun, 30 Nov 2014 13:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1417353836!12375175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26525 invoked from network); 30 Nov 2014 13:23:57 -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; 30 Nov 2014 13:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tk-0008Dy-Q3 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Tk-0000gN-OF for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:56 +0000 Date: Sun, 30 Nov 2014 13:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ad715304b04739fd2fc9517ce8671d3947c7621 Author: Jan Beulich AuthorDate: Thu Nov 27 14:00:23 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:00:23 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 6 +++--- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 73d01bb..11c7d9f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1750,7 +1750,8 @@ unsigned long hypercall_create_continuation( return op; } -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1759,7 +1760,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1772,7 +1776,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) return 0; } - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1800,7 +1804,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index 54f25b7..dce3f1f 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -118,7 +118,7 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -354,7 +354,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -362,7 +362,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 43d02bc..06c90be 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -282,7 +282,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index d58aede..e5c23e2 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -195,6 +195,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -214,7 +216,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:24:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4To-0006W1-8O; Sun, 30 Nov 2014 13:24:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tn-0006Vp-5i for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:59 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id AB/74-25276-E6A1B745; Sun, 30 Nov 2014 13:23:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1417353836!12375175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26525 invoked from network); 30 Nov 2014 13:23:57 -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; 30 Nov 2014 13:23:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tk-0008Dy-Q3 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Tk-0000gN-OF for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:23:56 +0000 Date: Sun, 30 Nov 2014 13:23:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ad715304b04739fd2fc9517ce8671d3947c7621 Author: Jan Beulich AuthorDate: Thu Nov 27 14:00:23 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:00:23 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 6 +++--- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 73d01bb..11c7d9f 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1750,7 +1750,8 @@ unsigned long hypercall_create_continuation( return op; } -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1759,7 +1760,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1772,7 +1776,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) return 0; } - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1800,7 +1804,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index 54f25b7..dce3f1f 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -118,7 +118,7 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -354,7 +354,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -362,7 +362,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 43d02bc..06c90be 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -282,7 +282,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index d58aede..e5c23e2 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -195,6 +195,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -214,7 +216,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:24:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ty-0006Xg-B7; Sun, 30 Nov 2014 13:24:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tx-0006XQ-AT for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:09 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 33/8D-15461-87A1B745; Sun, 30 Nov 2014 13:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1417353847!12386749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20772 invoked from network); 30 Nov 2014 13:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tu-0008EX-VP for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Tu-0000h0-UJ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:06 +0000 Date: Sun, 30 Nov 2014 13:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: confine internally handled MMIO to solitary 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 c5397354b998d030b021810b8202de93b9526818 Author: Jan Beulich AuthorDate: Thu Nov 27 14:01:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:01:40 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 797eedf..d52a48c 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -181,11 +181,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -342,6 +355,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size < addr + : p->addr + p->count * 1L * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index f48b123..ab4ac50 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -226,6 +226,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -268,6 +270,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:24:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ty-0006Xg-B7; Sun, 30 Nov 2014 13:24:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tx-0006XQ-AT for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:09 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 33/8D-15461-87A1B745; Sun, 30 Nov 2014 13:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1417353847!12386749!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20772 invoked from network); 30 Nov 2014 13:24:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Tu-0008EX-VP for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Tu-0000h0-UJ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:06 +0000 Date: Sun, 30 Nov 2014 13:24:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: confine internally handled MMIO to solitary 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 c5397354b998d030b021810b8202de93b9526818 Author: Jan Beulich AuthorDate: Thu Nov 27 14:01:40 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:01:40 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 797eedf..d52a48c 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -181,11 +181,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -342,6 +355,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size < addr + : p->addr + p->count * 1L * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index f48b123..ab4ac50 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -226,6 +226,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -268,6 +270,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:24:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4U9-0006ZK-Dm; Sun, 30 Nov 2014 13:24:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4U8-0006Z9-Ni for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:20 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 96/F9-17958-48A1B745; Sun, 30 Nov 2014 13:24:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1417353857!14727513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7609 invoked from network); 30 Nov 2014 13:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4U5-0008Ed-4l for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4U5-0000hO-2n for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:17 +0000 Date: Sun, 30 Nov 2014 13:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: disable VPMU for PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d35f0f0cf072fe6313e6cc90ad5ed314a05e0c4 Author: Boris Ostrovsky AuthorDate: Thu Nov 27 14:02:45 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:02:45 2014 +0100 x86: disable VPMU for PVH guests Currently when VPMU is enabled on a system both HVM and PVH VPCUs will initialize their VPMUs, including setting up vpmu_ops. As result even though VPMU will not work for PVH guests (APIC is not supported there), the guest may decide to perform a write to a PMU MSR. This will cause a call to is_vlapic_lvtpc_enabled() which will crash the hypervisor, e.g.: (XEN) Xen call trace: (XEN) [] is_vlapic_lvtpc_enabled+0x13/0x22 (XEN) [] core2_vpmu_do_wrmsr+0x415/0x589 (XEN) [] vpmu_do_wrmsr+0x2a/0x33 (XEN) [] vmx_msr_write_intercept+0x268/0x557 (XEN) [] hvm_msr_write_intercept+0x36c/0x39b (XEN) [] vmx_vmexit_handler+0x1082/0x185b (XEN) [] vmx_asm_vmexit_handler+0x41/0xc0 If we prevent VPMU from being initialized on PVH guests we will avoid those accesses. Signed-off-by: Boris Ostrovsky Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/vpmu.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 265fc0e..1df74c2 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -219,6 +219,9 @@ void vpmu_initialise(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); uint8_t vendor = current_cpu_data.x86_vendor; + if ( is_pvh_vcpu(v) ) + return; + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) vpmu_destroy(v); vpmu_clear(vpmu); -- generated by git-patchbot for /home/xen/git/xen.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 30 13:24:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4U9-0006ZK-Dm; Sun, 30 Nov 2014 13:24:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4U8-0006Z9-Ni for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:20 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 96/F9-17958-48A1B745; Sun, 30 Nov 2014 13:24:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1417353857!14727513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7609 invoked from network); 30 Nov 2014 13:24:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4U5-0008Ed-4l for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4U5-0000hO-2n for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:17 +0000 Date: Sun, 30 Nov 2014 13:24:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: disable VPMU for PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d35f0f0cf072fe6313e6cc90ad5ed314a05e0c4 Author: Boris Ostrovsky AuthorDate: Thu Nov 27 14:02:45 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:02:45 2014 +0100 x86: disable VPMU for PVH guests Currently when VPMU is enabled on a system both HVM and PVH VPCUs will initialize their VPMUs, including setting up vpmu_ops. As result even though VPMU will not work for PVH guests (APIC is not supported there), the guest may decide to perform a write to a PMU MSR. This will cause a call to is_vlapic_lvtpc_enabled() which will crash the hypervisor, e.g.: (XEN) Xen call trace: (XEN) [] is_vlapic_lvtpc_enabled+0x13/0x22 (XEN) [] core2_vpmu_do_wrmsr+0x415/0x589 (XEN) [] vpmu_do_wrmsr+0x2a/0x33 (XEN) [] vmx_msr_write_intercept+0x268/0x557 (XEN) [] hvm_msr_write_intercept+0x36c/0x39b (XEN) [] vmx_vmexit_handler+0x1082/0x185b (XEN) [] vmx_asm_vmexit_handler+0x41/0xc0 If we prevent VPMU from being initialized on PVH guests we will avoid those accesses. Signed-off-by: Boris Ostrovsky Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/vpmu.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/vpmu.c b/xen/arch/x86/hvm/vpmu.c index 265fc0e..1df74c2 100644 --- a/xen/arch/x86/hvm/vpmu.c +++ b/xen/arch/x86/hvm/vpmu.c @@ -219,6 +219,9 @@ void vpmu_initialise(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); uint8_t vendor = current_cpu_data.x86_vendor; + if ( is_pvh_vcpu(v) ) + return; + if ( vpmu_is_set(vpmu, VPMU_CONTEXT_ALLOCATED) ) vpmu_destroy(v); vpmu_clear(vpmu); -- generated by git-patchbot for /home/xen/git/xen.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 30 13:24:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24: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 1Xv4UI-0006au-GL; Sun, 30 Nov 2014 13:24:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UH-0006af-US for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:30 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id A9/21-02699-D8A1B745; Sun, 30 Nov 2014 13:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1417353867!8669754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3106 invoked from network); 30 Nov 2014 13:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UF-0008Ej-AV for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4UF-0000hl-8k for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:27 +0000 Date: Sun, 30 Nov 2014 13:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PVH: properly disable vLAPIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 712a8222302c6bd5221c2fbd03aedac18e4422ca Author: Jan Beulich AuthorDate: Thu Nov 27 14:03:23 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:03:23 2014 +0100 x86/PVH: properly disable vLAPIC Rather than guarding higher level operations (like vPMU initialization as suggested by Boris in http://lists.xenproject.org/archives/html/xen-devel/2014-11/msg02278.html) mark the vLAPIC hardware disabled for PVH guests and prevent it from getting moved out of this state. Reported-by: Boris Ostrovsky Signed-off-by: Jan Beulich Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/hvm.c | 6 +++--- xen/arch/x86/hvm/vlapic.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8f49b44..51ffc90 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2217,8 +2217,7 @@ int hvm_vcpu_initialise(struct vcpu *v) goto fail1; /* NB: vlapic_init must be called before hvm_funcs.vcpu_initialise */ - if ( is_hvm_vcpu(v) ) - rc = vlapic_init(v); + rc = vlapic_init(v); if ( rc != 0 ) /* teardown: vlapic_destroy */ goto fail2; @@ -4483,7 +4482,8 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content) break; case MSR_IA32_APICBASE: - if ( !vlapic_msr_set(vcpu_vlapic(v), msr_content) ) + if ( unlikely(is_pvh_vcpu(v)) || + !vlapic_msr_set(vcpu_vlapic(v), msr_content) ) goto gp_fault; break; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 0b7b607..72b6509 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1429,6 +1429,12 @@ int vlapic_init(struct vcpu *v) HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "%d", v->vcpu_id); + if ( is_pvh_vcpu(v) ) + { + vlapic->hw.disabled = VLAPIC_HW_DISABLED; + return 0; + } + vlapic->pt.source = PTSRC_lapic; if (vlapic->regs_page == NULL) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:24:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24: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 1Xv4UI-0006au-GL; Sun, 30 Nov 2014 13:24:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UH-0006af-US for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:30 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id A9/21-02699-D8A1B745; Sun, 30 Nov 2014 13:24:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1417353867!8669754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3106 invoked from network); 30 Nov 2014 13:24:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UF-0008Ej-AV for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4UF-0000hl-8k for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:27 +0000 Date: Sun, 30 Nov 2014 13:24:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PVH: properly disable vLAPIC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 712a8222302c6bd5221c2fbd03aedac18e4422ca Author: Jan Beulich AuthorDate: Thu Nov 27 14:03:23 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:03:23 2014 +0100 x86/PVH: properly disable vLAPIC Rather than guarding higher level operations (like vPMU initialization as suggested by Boris in http://lists.xenproject.org/archives/html/xen-devel/2014-11/msg02278.html) mark the vLAPIC hardware disabled for PVH guests and prevent it from getting moved out of this state. Reported-by: Boris Ostrovsky Signed-off-by: Jan Beulich Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/hvm.c | 6 +++--- xen/arch/x86/hvm/vlapic.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8f49b44..51ffc90 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2217,8 +2217,7 @@ int hvm_vcpu_initialise(struct vcpu *v) goto fail1; /* NB: vlapic_init must be called before hvm_funcs.vcpu_initialise */ - if ( is_hvm_vcpu(v) ) - rc = vlapic_init(v); + rc = vlapic_init(v); if ( rc != 0 ) /* teardown: vlapic_destroy */ goto fail2; @@ -4483,7 +4482,8 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content) break; case MSR_IA32_APICBASE: - if ( !vlapic_msr_set(vcpu_vlapic(v), msr_content) ) + if ( unlikely(is_pvh_vcpu(v)) || + !vlapic_msr_set(vcpu_vlapic(v), msr_content) ) goto gp_fault; break; diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 0b7b607..72b6509 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1429,6 +1429,12 @@ int vlapic_init(struct vcpu *v) HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "%d", v->vcpu_id); + if ( is_pvh_vcpu(v) ) + { + vlapic->hw.disabled = VLAPIC_HW_DISABLED; + return 0; + } + vlapic->pt.source = PTSRC_lapic; if (vlapic->regs_page == NULL) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:24:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24: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 1Xv4US-0006cU-Ix; Sun, 30 Nov 2014 13:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UR-0006cH-N9 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:39 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 25/5B-03148-79A1B745; Sun, 30 Nov 2014 13:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1417353877!8669766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3310 invoked from network); 30 Nov 2014 13:24:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UP-0008Er-Fm for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4UP-0000iB-EI for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:37 +0000 Date: Sun, 30 Nov 2014 13:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/flask: add two missing domctls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac16e70b2648ee782fb084c73ee63804209498fd Author: Daniel De Graaf AuthorDate: Thu Nov 27 14:04:23 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:04:23 2014 +0100 xsm/flask: add two missing domctls Reported-by: Michael Young Signed-off-by: Daniel De Graaf Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk --- xen/xsm/flask/hooks.c | 2 ++ xen/xsm/flask/policy/access_vectors | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 0ba2ce9..d48463f 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -672,9 +672,11 @@ static int flask_domctl(struct domain *d, int cmd) return current_has_perm(d, SECCLASS_HVM, HVM__CACHEATTR); case XEN_DOMCTL_set_ext_vcpucontext: + case XEN_DOMCTL_set_vcpu_msrs: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__SETEXTVCPUCONTEXT); case XEN_DOMCTL_get_ext_vcpucontext: + case XEN_DOMCTL_get_vcpu_msrs: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__GETEXTVCPUCONTEXT); case XEN_DOMCTL_setvcpuextstate: diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 1cd451e..1da9f63 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -151,8 +151,10 @@ class domain # XEN_DOMCTL_sendtrigger trigger # XEN_DOMCTL_get_ext_vcpucontext +# XEN_DOMCTL_set_vcpu_msrs getextvcpucontext # XEN_DOMCTL_set_ext_vcpucontext +# XEN_DOMCTL_get_vcpu_msrs setextvcpucontext # XEN_DOMCTL_getvcpuextstate getvcpuextstate -- generated by git-patchbot for /home/xen/git/xen.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 30 13:24:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24: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 1Xv4US-0006cU-Ix; Sun, 30 Nov 2014 13:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UR-0006cH-N9 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:39 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 25/5B-03148-79A1B745; Sun, 30 Nov 2014 13:24:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1417353877!8669766!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3310 invoked from network); 30 Nov 2014 13:24:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UP-0008Er-Fm for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4UP-0000iB-EI for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:37 +0000 Date: Sun, 30 Nov 2014 13:24:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/flask: add two missing domctls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ac16e70b2648ee782fb084c73ee63804209498fd Author: Daniel De Graaf AuthorDate: Thu Nov 27 14:04:23 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:04:23 2014 +0100 xsm/flask: add two missing domctls Reported-by: Michael Young Signed-off-by: Daniel De Graaf Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk --- xen/xsm/flask/hooks.c | 2 ++ xen/xsm/flask/policy/access_vectors | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 0ba2ce9..d48463f 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -672,9 +672,11 @@ static int flask_domctl(struct domain *d, int cmd) return current_has_perm(d, SECCLASS_HVM, HVM__CACHEATTR); case XEN_DOMCTL_set_ext_vcpucontext: + case XEN_DOMCTL_set_vcpu_msrs: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__SETEXTVCPUCONTEXT); case XEN_DOMCTL_get_ext_vcpucontext: + case XEN_DOMCTL_get_vcpu_msrs: return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN__GETEXTVCPUCONTEXT); case XEN_DOMCTL_setvcpuextstate: diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 1cd451e..1da9f63 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -151,8 +151,10 @@ class domain # XEN_DOMCTL_sendtrigger trigger # XEN_DOMCTL_get_ext_vcpucontext +# XEN_DOMCTL_set_vcpu_msrs getextvcpucontext # XEN_DOMCTL_set_ext_vcpucontext +# XEN_DOMCTL_get_vcpu_msrs setextvcpucontext # XEN_DOMCTL_getvcpuextstate getvcpuextstate -- generated by git-patchbot for /home/xen/git/xen.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 30 13:24:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ud-0006eE-Lk; Sun, 30 Nov 2014 13:24:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uc-0006dz-GV for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:50 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id CC/C5-02576-1AA1B745; Sun, 30 Nov 2014 13:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1417353887!12021231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22439 invoked from network); 30 Nov 2014 13:24:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UZ-0008Ex-KI for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4UZ-0000iY-Ix for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:47 +0000 Date: Sun, 30 Nov 2014 13:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/commandline: Refresh document for 4.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 c30ba28538134e29f7f8274a74b44058a04c4a68 Author: Andrew Cooper AuthorDate: Thu Nov 27 14:04:44 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:04:44 2014 +0100 docs/commandline: Refresh document for 4.5 * Add options whose code has been committed (without a patch to this file). * Remove options which have been deleted (without a patch to this file). * Tweak some formatting for consistency. * Nuke some trailing whitespace. I believe this document now identifies the exact set of command line options accepted by Xen, for both x86 and ARM architectures. Signed-off-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 79 ++++++++++++++++++++++++----------- 1 files changed, 55 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 2b7d29c..0866df2 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -159,6 +159,15 @@ to boot on systems with the following errata: triggerable Denial of Service. Override only if you trust all of your PV guests. +### apicv +> `= ` + +> Default: `true` + +Permit Xen to use APIC Virtualisation Extensions. This is an optimisation +available as part of VT-x, and allows hardware to take care of the guests APIC +handling, rather than requiring emulation in Xen. + ### apic\_verbosity > `= verbose | debug` @@ -173,6 +182,15 @@ 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. +### asid +> `= ` + +> Default: `true` + +Permit Xen to use Address Space Identifiers. This is an optimisation which +tags the TLB entries with an ID per vcpu. This allows for guest TLB flushes +to be performed without the overhead of a complete TLB flush. + ### ats > `= ` @@ -209,7 +227,7 @@ Scrub free RAM during boot. This is a safety feature to prevent accidentally leaking sensitive VM data into other VMs if Xen crashes and reboots. -### `bootscrub_chunk` +### bootscrub\_chunk > `= ` > Default: `128M` @@ -219,11 +237,6 @@ and not running softirqs. Reduce this if softirqs are not being run frequently enough. Setting this to a high value may cause boot failure, particularly if the NMI watchdog is also enabled. -### cachesize -> `= ` - -If set, override Xen's calculation of the level 2 cache line size. - ### clocksource > `= pit | hpet | acpi` @@ -328,7 +341,7 @@ into the console ring buffer. ### conswitch > `= [x]` -> Default `conswitch=a` +> Default: `conswitch=a` Specify which character should be used to switch serial input between Xen and dom0. The required sequence is CTRL-<switch char> three @@ -340,6 +353,11 @@ including omission, causes Xen to automatically switch to the dom0 console during dom0 boot. Use `conswitch=ax` to keep the default switch character, but for xen to keep the console. +### core\_parking +> `= power | performance` + +> Default: `power` + ### cpu\_type > `= arch_perfmon` @@ -403,7 +421,7 @@ description of the other respective options above. ### cpuinfo > `= ` -### crashinfo_maxaddr +### crashinfo\_maxaddr > `= ` > Default: `4G` @@ -531,6 +549,14 @@ Pin dom0 vcpus to their respective pcpus Flag that makes a 64bit dom0 boot in PVH mode. No 32bit support at present. +### dtuart (ARM) +> `= path [,options]` + +> Default: `""` + +Specify the full path in the device tree for the UART. If the path doesn't +start with `/`, it is assumed to be an alias. The options are device specific. + ### e820-mtrr-clip > `= ` @@ -675,6 +701,13 @@ intended to be used when domain 0 is a stub domain which builds a disaggregated system including a hardware domain with the specified domain ID. This option is supported only when compiled with XSM\_ENABLE=y on x86. +### hest\_disable +> ` = ` + +> Default: `false` + +Control Xens use of the APEI Hardware Error Source Table, should one be found. + ### hpetbroadcast > `= ` @@ -881,6 +914,14 @@ which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination with **crashinfo_maxaddr**. +### low\_mem\_virq\_limit +> `= ` + +> Default: `64M` + +Specify the threshold below which Xen will inform dom0 that the quantity of +free memory is getting low. Specifying `0` will disable this notification. + ### max\_cstate > `= ` @@ -958,9 +999,6 @@ Because responsibility for APIC setup is shared between Xen and the domain 0 kernel this option is automatically propagated to the domain 0 command line. -### nofxsr -> `= ` - ### noirqbalance > `= ` @@ -990,11 +1028,6 @@ Do not automatically reboot after an error. This is useful for catching debug output. Defaults to automatically reboot after 5 seconds. -### noserialnumber -> `= ` - -Disable CPU serial number reporting. - ### nosmp > `= ` @@ -1007,15 +1040,16 @@ Defaults to booting secondary processors. ### numa > `= on | off | fake= | noacpi` -Default: `on` +> Default: `on` ### pci > `= {no-}serr | {no-}perr` +> Default: Signaling left as set by firmware. + Disable signaling of SERR (system errors) and/or PERR (parity errors) on all PCI devices. -Default: Signaling left as set by firmware. ### pci-phantom > `=[:]:,` @@ -1056,7 +1090,7 @@ The following resources are available: ### reboot > `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` -Default: `0` +> Default: `0` Specify the host reboot method. @@ -1187,9 +1221,6 @@ pages) must also be specified via the tbuf\_size parameter. ### tmem\_dedup > `= ` -### tmem\_lock -> `= ` - ### tmem\_shared\_auth > `= ` @@ -1281,8 +1312,8 @@ flushes on VM entry and exit, increasing performance. Switch on the virtualized performance monitoring unit for HVM guests. -If the current cpu isn't supported a message like -'VPMU: Initialization failed. ...' +If the current cpu isn't supported a message like +'VPMU: Initialization failed. ...' is printed on the hypervisor serial log. For some Intel Nehalem processors a quirk handling exist for an unknown -- generated by git-patchbot for /home/xen/git/xen.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 30 13:24:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:24:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ud-0006eE-Lk; Sun, 30 Nov 2014 13:24:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uc-0006dz-GV for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:50 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id CC/C5-02576-1AA1B745; Sun, 30 Nov 2014 13:24:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1417353887!12021231!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22439 invoked from network); 30 Nov 2014 13:24:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:24:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4UZ-0008Ex-KI for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4UZ-0000iY-Ix for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:47 +0000 Date: Sun, 30 Nov 2014 13:24:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/commandline: Refresh document for 4.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 c30ba28538134e29f7f8274a74b44058a04c4a68 Author: Andrew Cooper AuthorDate: Thu Nov 27 14:04:44 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:04:44 2014 +0100 docs/commandline: Refresh document for 4.5 * Add options whose code has been committed (without a patch to this file). * Remove options which have been deleted (without a patch to this file). * Tweak some formatting for consistency. * Nuke some trailing whitespace. I believe this document now identifies the exact set of command line options accepted by Xen, for both x86 and ARM architectures. Signed-off-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 79 ++++++++++++++++++++++++----------- 1 files changed, 55 insertions(+), 24 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 2b7d29c..0866df2 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -159,6 +159,15 @@ to boot on systems with the following errata: triggerable Denial of Service. Override only if you trust all of your PV guests. +### apicv +> `= ` + +> Default: `true` + +Permit Xen to use APIC Virtualisation Extensions. This is an optimisation +available as part of VT-x, and allows hardware to take care of the guests APIC +handling, rather than requiring emulation in Xen. + ### apic\_verbosity > `= verbose | debug` @@ -173,6 +182,15 @@ 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. +### asid +> `= ` + +> Default: `true` + +Permit Xen to use Address Space Identifiers. This is an optimisation which +tags the TLB entries with an ID per vcpu. This allows for guest TLB flushes +to be performed without the overhead of a complete TLB flush. + ### ats > `= ` @@ -209,7 +227,7 @@ Scrub free RAM during boot. This is a safety feature to prevent accidentally leaking sensitive VM data into other VMs if Xen crashes and reboots. -### `bootscrub_chunk` +### bootscrub\_chunk > `= ` > Default: `128M` @@ -219,11 +237,6 @@ and not running softirqs. Reduce this if softirqs are not being run frequently enough. Setting this to a high value may cause boot failure, particularly if the NMI watchdog is also enabled. -### cachesize -> `= ` - -If set, override Xen's calculation of the level 2 cache line size. - ### clocksource > `= pit | hpet | acpi` @@ -328,7 +341,7 @@ into the console ring buffer. ### conswitch > `= [x]` -> Default `conswitch=a` +> Default: `conswitch=a` Specify which character should be used to switch serial input between Xen and dom0. The required sequence is CTRL-<switch char> three @@ -340,6 +353,11 @@ including omission, causes Xen to automatically switch to the dom0 console during dom0 boot. Use `conswitch=ax` to keep the default switch character, but for xen to keep the console. +### core\_parking +> `= power | performance` + +> Default: `power` + ### cpu\_type > `= arch_perfmon` @@ -403,7 +421,7 @@ description of the other respective options above. ### cpuinfo > `= ` -### crashinfo_maxaddr +### crashinfo\_maxaddr > `= ` > Default: `4G` @@ -531,6 +549,14 @@ Pin dom0 vcpus to their respective pcpus Flag that makes a 64bit dom0 boot in PVH mode. No 32bit support at present. +### dtuart (ARM) +> `= path [,options]` + +> Default: `""` + +Specify the full path in the device tree for the UART. If the path doesn't +start with `/`, it is assumed to be an alias. The options are device specific. + ### e820-mtrr-clip > `= ` @@ -675,6 +701,13 @@ intended to be used when domain 0 is a stub domain which builds a disaggregated system including a hardware domain with the specified domain ID. This option is supported only when compiled with XSM\_ENABLE=y on x86. +### hest\_disable +> ` = ` + +> Default: `false` + +Control Xens use of the APEI Hardware Error Source Table, should one be found. + ### hpetbroadcast > `= ` @@ -881,6 +914,14 @@ which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination with **crashinfo_maxaddr**. +### low\_mem\_virq\_limit +> `= ` + +> Default: `64M` + +Specify the threshold below which Xen will inform dom0 that the quantity of +free memory is getting low. Specifying `0` will disable this notification. + ### max\_cstate > `= ` @@ -958,9 +999,6 @@ Because responsibility for APIC setup is shared between Xen and the domain 0 kernel this option is automatically propagated to the domain 0 command line. -### nofxsr -> `= ` - ### noirqbalance > `= ` @@ -990,11 +1028,6 @@ Do not automatically reboot after an error. This is useful for catching debug output. Defaults to automatically reboot after 5 seconds. -### noserialnumber -> `= ` - -Disable CPU serial number reporting. - ### nosmp > `= ` @@ -1007,15 +1040,16 @@ Defaults to booting secondary processors. ### numa > `= on | off | fake= | noacpi` -Default: `on` +> Default: `on` ### pci > `= {no-}serr | {no-}perr` +> Default: Signaling left as set by firmware. + Disable signaling of SERR (system errors) and/or PERR (parity errors) on all PCI devices. -Default: Signaling left as set by firmware. ### pci-phantom > `=[:]:,` @@ -1056,7 +1090,7 @@ The following resources are available: ### reboot > `= t[riple] | k[bd] | a[cpi] | p[ci] | n[o] [, [w]arm | [c]old]` -Default: `0` +> Default: `0` Specify the host reboot method. @@ -1187,9 +1221,6 @@ pages) must also be specified via the tbuf\_size parameter. ### tmem\_dedup > `= ` -### tmem\_lock -> `= ` - ### tmem\_shared\_auth > `= ` @@ -1281,8 +1312,8 @@ flushes on VM entry and exit, increasing performance. Switch on the virtualized performance monitoring unit for HVM guests. -If the current cpu isn't supported a message like -'VPMU: Initialization failed. ...' +If the current cpu isn't supported a message like +'VPMU: Initialization failed. ...' is printed on the hypervisor serial log. For some Intel Nehalem processors a quirk handling exist for an unknown -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Un-0006gE-Qh; Sun, 30 Nov 2014 13:25:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Um-0006fu-Fx for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:00 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id B2/8B-24124-BAA1B745; Sun, 30 Nov 2014 13:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1417353897!14100863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14836 invoked from network); 30 Nov 2014 13:24:58 -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; 30 Nov 2014 13:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uj-0008F6-Px for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Uj-0000jg-OQ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:57 +0000 Date: Sun, 30 Nov 2014 13:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: allow copying between bitmaps of different sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c098487d36f2ab1d698a2b163d9d692facaf2ac Author: Wei Liu AuthorDate: Tue Nov 25 10:59:47 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 28 11:01:00 2014 +0000 libxl: allow copying between bitmaps of different sizes When parsing bitmap objects JSON parser will create libxl_bitmap map of the smallest size needed. This can cause problems when saved image file specifies CPU affinity. For example, if 'vcpu_hard_affinity' in the saved image has only the first CPU specified, just a single byte will be allocated and libxl_bitmap->size will be set to 1. This will result in assertion in libxl_set_vcpuaffinity()->libxl_bitmap_copy() since the destination bitmap is created for maximum number of CPUs. We could allocate that bitmap of the same size as the source, however, it is later passed to xc_vcpu_setaffinity() which expects it to be sized to the max number of CPUs To fix this issue, introduce an internal function to allowing copying between bitmaps of different sizes. Note that this function is only used in libxl_set_vcpuaffinity at the moment. Though NUMA placement logic invoke libxl_bitmap_copy as well there's no need to replace those invocations. NUMA placement logic comes into effect when no vcpu / node pinning is provided, so it always operates on bitmap of the same sizes (that is, size of maximum number of cpus /nodes). Reported-by: Boris Ostrovsky Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Dario Faggioli Reviewed-by: Dario Faggioli Tested-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxl/libxl.c | 4 ++-- tools/libxl/libxl_internal.h | 11 +++++++++++ tools/libxl/libxl_utils.c | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index de23fec..1e9da10 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5320,7 +5320,7 @@ int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, if (rc) goto out; - libxl_bitmap_copy(ctx, &hard, cpumap_hard); + libxl__bitmap_copy_best_effort(gc, &hard, cpumap_hard); flags = XEN_VCPUAFFINITY_HARD; } if (cpumap_soft) { @@ -5328,7 +5328,7 @@ int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, if (rc) goto out; - libxl_bitmap_copy(ctx, &soft, cpumap_soft); + libxl__bitmap_copy_best_effort(gc, &soft, cpumap_soft); flags |= XEN_VCPUAFFINITY_SOFT; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4361421..a38f695 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3617,6 +3617,17 @@ static inline void libxl__update_config_vtpm(libxl__gc *gc, libxl_device_##type##_copy(CTX, DA_p, (dev)); \ }) +/* This function copies X bytes from source to destination bitmap, + * where X is the smaller of the two sizes. + * + * If destination's size is larger than source, the extra bytes are + * untouched. + * + * XXX This is introduced to fix a regression for 4.5. It shall + * be revisited in 4.6 time frame. + */ +void libxl__bitmap_copy_best_effort(libxl__gc *gc, libxl_bitmap *dptr, + const libxl_bitmap *sptr); #endif /* diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 58df4f3..3e1ba17 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -614,6 +614,21 @@ void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); } +/* This function copies X bytes from source to destination bitmap, + * where X is the smaller of the two sizes. + * + * If destination's size is larger than source, the extra bytes are + * untouched. + */ +void libxl__bitmap_copy_best_effort(libxl__gc *gc, libxl_bitmap *dptr, + const libxl_bitmap *sptr) +{ + int sz; + + sz = dptr->size < sptr->size ? dptr->size : sptr->size; + memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); +} + void libxl_bitmap_copy_alloc(libxl_ctx *ctx, libxl_bitmap *dptr, const libxl_bitmap *sptr) -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Un-0006gE-Qh; Sun, 30 Nov 2014 13:25:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Um-0006fu-Fx for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:00 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id B2/8B-24124-BAA1B745; Sun, 30 Nov 2014 13:24:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1417353897!14100863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14836 invoked from network); 30 Nov 2014 13:24:58 -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; 30 Nov 2014 13:24:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uj-0008F6-Px for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Uj-0000jg-OQ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:24:57 +0000 Date: Sun, 30 Nov 2014 13:24:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: allow copying between bitmaps of different sizes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c098487d36f2ab1d698a2b163d9d692facaf2ac Author: Wei Liu AuthorDate: Tue Nov 25 10:59:47 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 28 11:01:00 2014 +0000 libxl: allow copying between bitmaps of different sizes When parsing bitmap objects JSON parser will create libxl_bitmap map of the smallest size needed. This can cause problems when saved image file specifies CPU affinity. For example, if 'vcpu_hard_affinity' in the saved image has only the first CPU specified, just a single byte will be allocated and libxl_bitmap->size will be set to 1. This will result in assertion in libxl_set_vcpuaffinity()->libxl_bitmap_copy() since the destination bitmap is created for maximum number of CPUs. We could allocate that bitmap of the same size as the source, however, it is later passed to xc_vcpu_setaffinity() which expects it to be sized to the max number of CPUs To fix this issue, introduce an internal function to allowing copying between bitmaps of different sizes. Note that this function is only used in libxl_set_vcpuaffinity at the moment. Though NUMA placement logic invoke libxl_bitmap_copy as well there's no need to replace those invocations. NUMA placement logic comes into effect when no vcpu / node pinning is provided, so it always operates on bitmap of the same sizes (that is, size of maximum number of cpus /nodes). Reported-by: Boris Ostrovsky Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Dario Faggioli Reviewed-by: Dario Faggioli Tested-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxl/libxl.c | 4 ++-- tools/libxl/libxl_internal.h | 11 +++++++++++ tools/libxl/libxl_utils.c | 15 +++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index de23fec..1e9da10 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5320,7 +5320,7 @@ int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, if (rc) goto out; - libxl_bitmap_copy(ctx, &hard, cpumap_hard); + libxl__bitmap_copy_best_effort(gc, &hard, cpumap_hard); flags = XEN_VCPUAFFINITY_HARD; } if (cpumap_soft) { @@ -5328,7 +5328,7 @@ int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, if (rc) goto out; - libxl_bitmap_copy(ctx, &soft, cpumap_soft); + libxl__bitmap_copy_best_effort(gc, &soft, cpumap_soft); flags |= XEN_VCPUAFFINITY_SOFT; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4361421..a38f695 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3617,6 +3617,17 @@ static inline void libxl__update_config_vtpm(libxl__gc *gc, libxl_device_##type##_copy(CTX, DA_p, (dev)); \ }) +/* This function copies X bytes from source to destination bitmap, + * where X is the smaller of the two sizes. + * + * If destination's size is larger than source, the extra bytes are + * untouched. + * + * XXX This is introduced to fix a regression for 4.5. It shall + * be revisited in 4.6 time frame. + */ +void libxl__bitmap_copy_best_effort(libxl__gc *gc, libxl_bitmap *dptr, + const libxl_bitmap *sptr); #endif /* diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 58df4f3..3e1ba17 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -614,6 +614,21 @@ void libxl_bitmap_copy(libxl_ctx *ctx, libxl_bitmap *dptr, memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); } +/* This function copies X bytes from source to destination bitmap, + * where X is the smaller of the two sizes. + * + * If destination's size is larger than source, the extra bytes are + * untouched. + */ +void libxl__bitmap_copy_best_effort(libxl__gc *gc, libxl_bitmap *dptr, + const libxl_bitmap *sptr) +{ + int sz; + + sz = dptr->size < sptr->size ? dptr->size : sptr->size; + memcpy(dptr->map, sptr->map, sz * sizeof(*dptr->map)); +} + void libxl_bitmap_copy_alloc(libxl_ctx *ctx, libxl_bitmap *dptr, const libxl_bitmap *sptr) -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uy-0006hx-Th; Sun, 30 Nov 2014 13:25:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ux-0006hd-9X for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:11 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 92/4A-17958-6BA1B745; Sun, 30 Nov 2014 13:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1417353908!10370262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31460 invoked from network); 30 Nov 2014 13:25:09 -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; 30 Nov 2014 13:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uu-0008Fh-1y for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Ut-0000kG-U0 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:07 +0000 Date: Sun, 30 Nov 2014 13:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] INSTALL: correct EXTRA_CFLAGS 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 d27ccd4fcbc2ed803fd10f03dabad4ae8f5c8ae9 Author: Olaf Hering AuthorDate: Thu Nov 27 10:26:26 2014 +0100 Commit: Ian Campbell CommitDate: Fri Nov 28 11:03:04 2014 +0000 INSTALL: correct EXTRA_CFLAGS handling The already documented configure patch was not applied. Adjust documentation to describe existing behaviour. Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Cc: Konrad Rzeszutek Wilk Reviewed-by: Konrad Rzeszutek Wilk --- INSTALL | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/INSTALL b/INSTALL index 6bb9d23..0bc67ea 100644 --- a/INSTALL +++ b/INSTALL @@ -128,13 +128,6 @@ original xenstored will be used. Valid names are xenstored and oxenstored. --with-xenstored=name -Using additional CFLAGS to build tools running in dom0 is required when -building distro packages. This is the option to pass things like -RPM_OPT_FLAGS. - --with-extra-cflags-tools=EXTRA_CFLAGS - --with-extra-cflags-qemu-traditional=EXTRA_CFLAGS - --with-extra-cflags-qemu-upstream=EXTRA_CFLAGS - Instead of starting the tools in dom0 with sysv runlevel scripts they can also be started by systemd. If this option is enabled xenstored will receive the communication socked directly from systemd. So starting it @@ -241,6 +234,13 @@ QEMU_UPSTREAM_URL= QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= +Using additional CFLAGS to build tools which will run in dom0 is +required when building distro packages. These variables can be used to +pass RPM_OPT_FLAGS. +EXTRA_CFLAGS_XEN_TOOLS= +EXTRA_CFLAGS_QEMU_TRADITIONAL= +EXTRA_CFLAGS_QEMU_XEN= + This variable can be used to use DIR/include and DIR/lib during build. This is the same as PREPEND_LIB and PREPEND_INCLUDES. APPEND_LIB and APPEND_INCLUDES= will be appended to the CFLAGS/LDFLAGS variable. @@ -310,10 +310,10 @@ sudo make install BOOT_DIR=/ood/path/boot EFI_DIR=/odd/path/efi %build export WGET=$(type -P false) export GIT=$(type -P false) +export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS" +export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS" +export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS" %configure \ - --with-extra-cflags-tools="$RPM_OPT_FLAGS" \ - --with-extra-cflags-qemu-traditional="$RPM_OPT_FLAGS" \ - --with-extra-cflags-qemu-upstream="$RPM_OPT_FLAGS" \ --with-initddir=%{_initddir} unset CFLAGS CXXFLAGS FFLAGS LDFLAGS make -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uy-0006hx-Th; Sun, 30 Nov 2014 13:25:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Ux-0006hd-9X for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:11 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 92/4A-17958-6BA1B745; Sun, 30 Nov 2014 13:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1417353908!10370262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31460 invoked from network); 30 Nov 2014 13:25:09 -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; 30 Nov 2014 13:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Uu-0008Fh-1y for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4Ut-0000kG-U0 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:07 +0000 Date: Sun, 30 Nov 2014 13:25:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] INSTALL: correct EXTRA_CFLAGS 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 d27ccd4fcbc2ed803fd10f03dabad4ae8f5c8ae9 Author: Olaf Hering AuthorDate: Thu Nov 27 10:26:26 2014 +0100 Commit: Ian Campbell CommitDate: Fri Nov 28 11:03:04 2014 +0000 INSTALL: correct EXTRA_CFLAGS handling The already documented configure patch was not applied. Adjust documentation to describe existing behaviour. Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Cc: Konrad Rzeszutek Wilk Reviewed-by: Konrad Rzeszutek Wilk --- INSTALL | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/INSTALL b/INSTALL index 6bb9d23..0bc67ea 100644 --- a/INSTALL +++ b/INSTALL @@ -128,13 +128,6 @@ original xenstored will be used. Valid names are xenstored and oxenstored. --with-xenstored=name -Using additional CFLAGS to build tools running in dom0 is required when -building distro packages. This is the option to pass things like -RPM_OPT_FLAGS. - --with-extra-cflags-tools=EXTRA_CFLAGS - --with-extra-cflags-qemu-traditional=EXTRA_CFLAGS - --with-extra-cflags-qemu-upstream=EXTRA_CFLAGS - Instead of starting the tools in dom0 with sysv runlevel scripts they can also be started by systemd. If this option is enabled xenstored will receive the communication socked directly from systemd. So starting it @@ -241,6 +234,13 @@ QEMU_UPSTREAM_URL= QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= +Using additional CFLAGS to build tools which will run in dom0 is +required when building distro packages. These variables can be used to +pass RPM_OPT_FLAGS. +EXTRA_CFLAGS_XEN_TOOLS= +EXTRA_CFLAGS_QEMU_TRADITIONAL= +EXTRA_CFLAGS_QEMU_XEN= + This variable can be used to use DIR/include and DIR/lib during build. This is the same as PREPEND_LIB and PREPEND_INCLUDES. APPEND_LIB and APPEND_INCLUDES= will be appended to the CFLAGS/LDFLAGS variable. @@ -310,10 +310,10 @@ sudo make install BOOT_DIR=/ood/path/boot EFI_DIR=/odd/path/efi %build export WGET=$(type -P false) export GIT=$(type -P false) +export EXTRA_CFLAGS_XEN_TOOLS="$RPM_OPT_FLAGS" +export EXTRA_CFLAGS_QEMU_TRADITIONAL="$RPM_OPT_FLAGS" +export EXTRA_CFLAGS_QEMU_XEN="$RPM_OPT_FLAGS" %configure \ - --with-extra-cflags-tools="$RPM_OPT_FLAGS" \ - --with-extra-cflags-qemu-traditional="$RPM_OPT_FLAGS" \ - --with-extra-cflags-qemu-upstream="$RPM_OPT_FLAGS" \ --with-initddir=%{_initddir} unset CFLAGS CXXFLAGS FFLAGS LDFLAGS make -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4V9-0006jS-02; Sun, 30 Nov 2014 13:25:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4V7-0006j9-Ai for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:21 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id BC/EF-23865-0CA1B745; Sun, 30 Nov 2014 13:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1417353919!10370278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31686 invoked from network); 30 Nov 2014 13:25:19 -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; 30 Nov 2014 13:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4V4-0008Fp-RJ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4V4-0000ke-PI for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:18 +0000 Date: Sun, 30 Nov 2014 13:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/oxenstored: Fix | vs & error in fd event 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 e01898f17ca667c2630c8b7dfe43490f48331e53 Author: Andrew Cooper AuthorDate: Wed Nov 26 15:09:40 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 28 11:09:24 2014 +0000 tools/oxenstored: Fix | vs & error in fd event handling This makes fields 0 and 1 true more often than they should be, resulting problems when handling events. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott CC: Zheng Li CC: Konrad Rzeszutek Wilk Reviewed-by: Zheng Li Reviewed-by: David Scott --- tools/ocaml/xenstored/select_stubs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/select_stubs.c b/tools/ocaml/xenstored/select_stubs.c index 4a8edb5..af72b84 100644 --- a/tools/ocaml/xenstored/select_stubs.c +++ b/tools/ocaml/xenstored/select_stubs.c @@ -56,8 +56,8 @@ CAMLprim value stub_select_on_poll(value fd_events, value timeo) { events = Field(Field(fd_events, i), 1); if (c_fds[i].revents & POLLNVAL) unix_error(EBADF, "select", Nothing); - Field(events, 0) = Val_bool(c_fds[i].events | POLLIN && c_fds[i].revents & (POLLIN |POLLHUP|POLLERR)); - Field(events, 1) = Val_bool(c_fds[i].events | POLLOUT && c_fds[i].revents & (POLLOUT|POLLHUP|POLLERR)); + Field(events, 0) = Val_bool(c_fds[i].events & POLLIN && c_fds[i].revents & (POLLIN |POLLHUP|POLLERR)); + Field(events, 1) = Val_bool(c_fds[i].events & POLLOUT && c_fds[i].revents & (POLLOUT|POLLHUP|POLLERR)); Field(events, 2) = Val_bool(c_fds[i].revents & POLLPRI); } -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4V9-0006jS-02; Sun, 30 Nov 2014 13:25:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4V7-0006j9-Ai for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:21 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id BC/EF-23865-0CA1B745; Sun, 30 Nov 2014 13:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1417353919!10370278!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31686 invoked from network); 30 Nov 2014 13:25:19 -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; 30 Nov 2014 13:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4V4-0008Fp-RJ for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4V4-0000ke-PI for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:18 +0000 Date: Sun, 30 Nov 2014 13:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/oxenstored: Fix | vs & error in fd event 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 e01898f17ca667c2630c8b7dfe43490f48331e53 Author: Andrew Cooper AuthorDate: Wed Nov 26 15:09:40 2014 +0000 Commit: Ian Campbell CommitDate: Fri Nov 28 11:09:24 2014 +0000 tools/oxenstored: Fix | vs & error in fd event handling This makes fields 0 and 1 true more often than they should be, resulting problems when handling events. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Dave Scott CC: Zheng Li CC: Konrad Rzeszutek Wilk Reviewed-by: Zheng Li Reviewed-by: David Scott --- tools/ocaml/xenstored/select_stubs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/xenstored/select_stubs.c b/tools/ocaml/xenstored/select_stubs.c index 4a8edb5..af72b84 100644 --- a/tools/ocaml/xenstored/select_stubs.c +++ b/tools/ocaml/xenstored/select_stubs.c @@ -56,8 +56,8 @@ CAMLprim value stub_select_on_poll(value fd_events, value timeo) { events = Field(Field(fd_events, i), 1); if (c_fds[i].revents & POLLNVAL) unix_error(EBADF, "select", Nothing); - Field(events, 0) = Val_bool(c_fds[i].events | POLLIN && c_fds[i].revents & (POLLIN |POLLHUP|POLLERR)); - Field(events, 1) = Val_bool(c_fds[i].events | POLLOUT && c_fds[i].revents & (POLLOUT|POLLHUP|POLLERR)); + Field(events, 0) = Val_bool(c_fds[i].events & POLLIN && c_fds[i].revents & (POLLIN |POLLHUP|POLLERR)); + Field(events, 1) = Val_bool(c_fds[i].events & POLLOUT && c_fds[i].revents & (POLLOUT|POLLHUP|POLLERR)); Field(events, 2) = Val_bool(c_fds[i].revents & POLLPRI); } -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VJ-0006l6-2f; Sun, 30 Nov 2014 13:25:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VH-0006kt-Qd for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:31 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 3B/9F-27584-BCA1B745; Sun, 30 Nov 2014 13:25:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1417353929!11197169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9810 invoked from network); 30 Nov 2014 13:25:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:25:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VF-0008Fx-1e for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4VE-0000l1-W8 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:29 +0000 Date: Sun, 30 Nov 2014 13:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remove domain field in xenstore backend dir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8722dd6c59a7f71acf45a3832059e4e85dd795ee Author: Chunyan Liu AuthorDate: Wed Nov 19 14:34:10 2014 +0800 Commit: Ian Campbell CommitDate: Fri Nov 28 11:21:13 2014 +0000 remove domain field in xenstore backend dir Remove the unusual 'domain' field under backend directory. The affected are backend/console, backend/vfb, backend/vkbd. The correct way to obtain a domain's name is via libxl_domid_to_name(), or by reading from /local/domain/$DOMID/name for toolstacks not using libxl. Signed-off-by: Chunyan Liu Acked-by: Ian Jackson [ ijc -- added second paragraph to commit message ] --- tools/libxl/libxl.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1e9da10..bdecfb2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3605,8 +3605,6 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(back, "1"); flexarray_append(back, "state"); flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "domain"); - flexarray_append(back, libxl__domid_to_name(gc, domid)); flexarray_append(back, "protocol"); flexarray_append(back, LIBXL_XENCONSOLE_PROTOCOL); @@ -3943,8 +3941,6 @@ int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, flexarray_append(back, "1"); flexarray_append(back, "state"); flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "domain"); - flexarray_append(back, libxl__domid_to_name(gc, domid)); flexarray_append(front, "backend-id"); flexarray_append(front, libxl__sprintf(gc, "%d", vkb->backend_domid)); @@ -4041,7 +4037,6 @@ int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb) flexarray_append_pair(back, "frontend-id", libxl__sprintf(gc, "%d", domid)); flexarray_append_pair(back, "online", "1"); flexarray_append_pair(back, "state", libxl__sprintf(gc, "%d", 1)); - flexarray_append_pair(back, "domain", libxl__domid_to_name(gc, domid)); flexarray_append_pair(back, "vnc", libxl_defbool_val(vfb->vnc.enable) ? "1" : "0"); flexarray_append_pair(back, "vnclisten", vfb->vnc.listen); -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VJ-0006l6-2f; Sun, 30 Nov 2014 13:25:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VH-0006kt-Qd for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:31 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 3B/9F-27584-BCA1B745; Sun, 30 Nov 2014 13:25:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1417353929!11197169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9810 invoked from network); 30 Nov 2014 13:25:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:25:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VF-0008Fx-1e for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4VE-0000l1-W8 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:29 +0000 Date: Sun, 30 Nov 2014 13:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] remove domain field in xenstore backend dir X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8722dd6c59a7f71acf45a3832059e4e85dd795ee Author: Chunyan Liu AuthorDate: Wed Nov 19 14:34:10 2014 +0800 Commit: Ian Campbell CommitDate: Fri Nov 28 11:21:13 2014 +0000 remove domain field in xenstore backend dir Remove the unusual 'domain' field under backend directory. The affected are backend/console, backend/vfb, backend/vkbd. The correct way to obtain a domain's name is via libxl_domid_to_name(), or by reading from /local/domain/$DOMID/name for toolstacks not using libxl. Signed-off-by: Chunyan Liu Acked-by: Ian Jackson [ ijc -- added second paragraph to commit message ] --- tools/libxl/libxl.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 1e9da10..bdecfb2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3605,8 +3605,6 @@ int libxl__device_console_add(libxl__gc *gc, uint32_t domid, flexarray_append(back, "1"); flexarray_append(back, "state"); flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "domain"); - flexarray_append(back, libxl__domid_to_name(gc, domid)); flexarray_append(back, "protocol"); flexarray_append(back, LIBXL_XENCONSOLE_PROTOCOL); @@ -3943,8 +3941,6 @@ int libxl__device_vkb_add(libxl__gc *gc, uint32_t domid, flexarray_append(back, "1"); flexarray_append(back, "state"); flexarray_append(back, libxl__sprintf(gc, "%d", 1)); - flexarray_append(back, "domain"); - flexarray_append(back, libxl__domid_to_name(gc, domid)); flexarray_append(front, "backend-id"); flexarray_append(front, libxl__sprintf(gc, "%d", vkb->backend_domid)); @@ -4041,7 +4037,6 @@ int libxl__device_vfb_add(libxl__gc *gc, uint32_t domid, libxl_device_vfb *vfb) flexarray_append_pair(back, "frontend-id", libxl__sprintf(gc, "%d", domid)); flexarray_append_pair(back, "online", "1"); flexarray_append_pair(back, "state", libxl__sprintf(gc, "%d", 1)); - flexarray_append_pair(back, "domain", libxl__domid_to_name(gc, domid)); flexarray_append_pair(back, "vnc", libxl_defbool_val(vfb->vnc.enable) ? "1" : "0"); flexarray_append_pair(back, "vnclisten", vfb->vnc.listen); -- generated by git-patchbot for /home/xen/git/xen.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 30 13:25:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25: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 1Xv4VU-0006mo-5L; Sun, 30 Nov 2014 13:25:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VS-0006mc-Il for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:42 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id CD/E5-08051-5DA1B745; Sun, 30 Nov 2014 13:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1417353939!7366489!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2558 invoked from network); 30 Nov 2014 13:25: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; 30 Nov 2014 13:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VP-0008G3-88 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4VP-0000lR-6k for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:39 +0000 Date: Sun, 30 Nov 2014 13:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix rename: xenstore not fully updated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 412f0e6401d9d87298b9bba3bfbe8ec899429a2c Author: Chunyan Liu AuthorDate: Wed Nov 19 14:34:11 2014 +0800 Commit: Ian Campbell CommitDate: Fri Nov 28 11:22:13 2014 +0000 fix rename: xenstore not fully updated libxl__domain_rename only updates /local/domain//name, /vm//name in xenstore are not updated. Add code in libxl__domain_rename to update /vm//name too. Signed-off-by: Chunyan Liu Acked-by: Ian Jackson --- tools/libxl/libxl.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bdecfb2..f84f7c2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -359,6 +359,9 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, uint32_t stub_dm_domid; const char *stub_dm_old_name = NULL, *stub_dm_new_name = NULL; int rc; + libxl_dominfo info; + char *uuid; + const char *vm_name_path; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) goto x_nomem; @@ -429,6 +432,16 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, goto x_fail; } + /* update /vm//name */ + rc = libxl_domain_info(ctx, &info, domid); + if (rc) + goto x_fail; + + uuid = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid)); + vm_name_path = GCSPRINTF("/vm/%s/name", uuid); + if (libxl__xs_write_checked(gc, trans, vm_name_path, new_name)) + goto x_fail; + if (stub_dm_domid) { rc = libxl__domain_rename(gc, stub_dm_domid, stub_dm_old_name, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:25:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25: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 1Xv4VU-0006mo-5L; Sun, 30 Nov 2014 13:25:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VS-0006mc-Il for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:42 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id CD/E5-08051-5DA1B745; Sun, 30 Nov 2014 13:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1417353939!7366489!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2558 invoked from network); 30 Nov 2014 13:25: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; 30 Nov 2014 13:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VP-0008G3-88 for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4VP-0000lR-6k for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:39 +0000 Date: Sun, 30 Nov 2014 13:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] fix rename: xenstore not fully updated X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 412f0e6401d9d87298b9bba3bfbe8ec899429a2c Author: Chunyan Liu AuthorDate: Wed Nov 19 14:34:11 2014 +0800 Commit: Ian Campbell CommitDate: Fri Nov 28 11:22:13 2014 +0000 fix rename: xenstore not fully updated libxl__domain_rename only updates /local/domain//name, /vm//name in xenstore are not updated. Add code in libxl__domain_rename to update /vm//name too. Signed-off-by: Chunyan Liu Acked-by: Ian Jackson --- tools/libxl/libxl.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bdecfb2..f84f7c2 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -359,6 +359,9 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, uint32_t stub_dm_domid; const char *stub_dm_old_name = NULL, *stub_dm_new_name = NULL; int rc; + libxl_dominfo info; + char *uuid; + const char *vm_name_path; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) goto x_nomem; @@ -429,6 +432,16 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, goto x_fail; } + /* update /vm//name */ + rc = libxl_domain_info(ctx, &info, domid); + if (rc) + goto x_fail; + + uuid = GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(info.uuid)); + vm_name_path = GCSPRINTF("/vm/%s/name", uuid); + if (libxl__xs_write_checked(gc, trans, vm_name_path, new_name)) + goto x_fail; + if (stub_dm_domid) { rc = libxl__domain_rename(gc, stub_dm_domid, stub_dm_old_name, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Nov 30 13:25:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Vd-0006oV-7w; Sun, 30 Nov 2014 13:25:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Vb-0006o7-IH for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:51 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id E0/04-09842-EDA1B745; Sun, 30 Nov 2014 13:25:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1417353949!12388528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18136 invoked from network); 30 Nov 2014 13:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VZ-0008G9-EE for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4VZ-0000lo-Bp for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:49 +0000 Date: Sun, 30 Nov 2014 13:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] set pv guest default video_memkb 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 188336bb86d0992a2a034ece5f39eccc5d10f337 Author: Zhigang Wang AuthorDate: Tue Nov 18 15:57:08 2014 -0500 Commit: Ian Campbell CommitDate: Fri Nov 28 11:23:58 2014 +0000 set pv guest default video_memkb to 0 Before this patch, pv guest video_memkb is -1, which is an invalid value. And it will cause the xenstore 'memory/targe' calculation wrong: memory/target = info->target_memkb - info->video_memkb Signed-off-by: Zhigang Wang Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index b1ff5ae..1198225 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -357,6 +357,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; case LIBXL_DOMAIN_TYPE_PV: libxl_defbool_setdefault(&b_info->u.pv.e820_host, false); + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; if (b_info->u.pv.slack_memkb == LIBXL_MEMKB_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 Sun Nov 30 13:25:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 30 Nov 2014 13:25:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Vd-0006oV-7w; Sun, 30 Nov 2014 13:25:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4Vb-0006o7-IH for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:51 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id E0/04-09842-EDA1B745; Sun, 30 Nov 2014 13:25:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1417353949!12388528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18136 invoked from network); 30 Nov 2014 13:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 30 Nov 2014 13:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xv4VZ-0008G9-EE for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xv4VZ-0000lo-Bp for xen-changelog@lists.xensource.com; Sun, 30 Nov 2014 13:25:49 +0000 Date: Sun, 30 Nov 2014 13:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] set pv guest default video_memkb 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 188336bb86d0992a2a034ece5f39eccc5d10f337 Author: Zhigang Wang AuthorDate: Tue Nov 18 15:57:08 2014 -0500 Commit: Ian Campbell CommitDate: Fri Nov 28 11:23:58 2014 +0000 set pv guest default video_memkb to 0 Before this patch, pv guest video_memkb is -1, which is an invalid value. And it will cause the xenstore 'memory/targe' calculation wrong: memory/target = info->target_memkb - info->video_memkb Signed-off-by: Zhigang Wang Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index b1ff5ae..1198225 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -357,6 +357,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; case LIBXL_DOMAIN_TYPE_PV: libxl_defbool_setdefault(&b_info->u.pv.e820_host, false); + if (b_info->video_memkb == LIBXL_MEMKB_DEFAULT) + b_info->video_memkb = 0; if (b_info->shadow_memkb == LIBXL_MEMKB_DEFAULT) b_info->shadow_memkb = 0; if (b_info->u.pv.slack_memkb == LIBXL_MEMKB_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