From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55: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 1ZWjDX-000689-3N; Tue, 01 Sep 2015 10:55:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDW-00067u-Hd for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:06 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 10/6A-24494-90485E55; Tue, 01 Sep 2015 10:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1441104904!31884605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9361 invoked from network); 1 Sep 2015 10:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDT-0001y2-4r for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDT-0004wl-00 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:03 +0000 Date: Tue, 01 Sep 2015 10:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/microcode: cleanup int type usage for cpu numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 901814d68bab33ee448970cf27b0f78328cab8a6 Author: Aravind Gopalakrishnan AuthorDate: Tue Aug 25 16:15:55 2015 +0200 Commit: Jan Beulich CommitDate: Tue Aug 25 16:15:55 2015 +0200 x86/microcode: cleanup int type usage for cpu numbers CPU numbers can't be negative. Fixing the microcode* files to properly use unsigned type in this patch. No functional change is introduced. Signed-off-by: Aravind Gopalakrishnan Acked-by: Jan Beulich Release-acked-by: Wei Liu --- xen/arch/x86/microcode.c | 6 +++--- xen/arch/x86/microcode_amd.c | 12 +++++++----- xen/arch/x86/microcode_intel.c | 15 ++++++++------- xen/include/asm-x86/microcode.h | 9 +++++---- xen/include/asm-x86/processor.h | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index 091d5d1..c20bde6 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -195,7 +195,7 @@ struct microcode_info { char buffer[1]; }; -static void __microcode_fini_cpu(int cpu) +static void __microcode_fini_cpu(unsigned int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); @@ -203,14 +203,14 @@ static void __microcode_fini_cpu(int cpu) memset(uci, 0, sizeof(*uci)); } -static void microcode_fini_cpu(int cpu) +static void microcode_fini_cpu(unsigned int cpu) { spin_lock(µcode_mutex); __microcode_fini_cpu(cpu); spin_unlock(µcode_mutex); } -int microcode_resume_cpu(int cpu) +int microcode_resume_cpu(unsigned int cpu) { int err; struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index f79b397..2717479 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -79,7 +79,7 @@ struct mpbhdr { static DEFINE_SPINLOCK(microcode_update_lock); /* See comment in start_update() for cases when this routine fails */ -static int collect_cpu_info(int cpu, struct cpu_signature *csig) +static int collect_cpu_info(unsigned int cpu, struct cpu_signature *csig) { struct cpuinfo_x86 *c = &cpu_data[cpu]; @@ -149,7 +149,8 @@ static bool_t find_equiv_cpu_id(const struct equiv_cpu_entry *equiv_cpu_table, return 0; } -static bool_t microcode_fits(const struct microcode_amd *mc_amd, int cpu) +static bool_t microcode_fits(const struct microcode_amd *mc_amd, + unsigned int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); const struct microcode_header_amd *mc_header = mc_amd->mpb; @@ -186,7 +187,7 @@ static bool_t microcode_fits(const struct microcode_amd *mc_amd, int cpu) return 1; } -static int apply_microcode(int cpu) +static int apply_microcode(unsigned int cpu) { unsigned long flags; struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); @@ -347,7 +348,8 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of return 0; } -static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) +static int cpu_request_microcode(unsigned int cpu, const void *buf, + size_t bufsize) { struct microcode_amd *mc_amd, *mc_old; size_t offset = 0; @@ -511,7 +513,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) return error; } -static int microcode_resume_match(int cpu, const void *mc) +static int microcode_resume_match(unsigned int cpu, const void *mc) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); struct microcode_amd *mc_amd = uci->mc.mc_amd; diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index b54cd71..0a5f403 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -90,7 +90,7 @@ struct extended_sigtable { /* serialize access to the physical write to MSR 0x79 */ static DEFINE_SPINLOCK(microcode_update_lock); -static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) +static int collect_cpu_info(unsigned int cpu_num, struct cpu_signature *csig) { struct cpuinfo_x86 *c = &cpu_data[cpu_num]; uint64_t msr_content; @@ -129,7 +129,7 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) } static inline int microcode_update_match( - int cpu_num, const struct microcode_header_intel *mc_header, + unsigned int cpu_num, const struct microcode_header_intel *mc_header, int sig, int pf) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu_num); @@ -232,7 +232,7 @@ static int microcode_sanity_check(void *mc) * return 1 - found update * return < 0 - error */ -static int get_matching_microcode(const void *mc, int cpu) +static int get_matching_microcode(const void *mc, unsigned int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); const struct microcode_header_intel *mc_header = mc; @@ -277,12 +277,12 @@ static int get_matching_microcode(const void *mc, int cpu) return 1; } -static int apply_microcode(int cpu) +static int apply_microcode(unsigned int cpu) { unsigned long flags; uint64_t msr_content; unsigned int val[2]; - int cpu_num = raw_smp_processor_id(); + unsigned int cpu_num = raw_smp_processor_id(); struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu_num); /* We should bind the task to the CPU */ @@ -351,7 +351,8 @@ static long get_next_ucode_from_buffer(void **mc, const u8 *buf, return offset + total_size; } -static int cpu_request_microcode(int cpu, const void *buf, size_t size) +static int cpu_request_microcode(unsigned int cpu, const void *buf, + size_t size) { long offset = 0; int error = 0; @@ -391,7 +392,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t size) return error; } -static int microcode_resume_match(int cpu, const void *mc) +static int microcode_resume_match(unsigned int cpu, const void *mc) { return get_matching_microcode(mc, cpu); } diff --git a/xen/include/asm-x86/microcode.h b/xen/include/asm-x86/microcode.h index 00a672a..23ea954 100644 --- a/xen/include/asm-x86/microcode.h +++ b/xen/include/asm-x86/microcode.h @@ -7,10 +7,11 @@ struct cpu_signature; struct ucode_cpu_info; struct microcode_ops { - int (*microcode_resume_match)(int cpu, const void *mc); - int (*cpu_request_microcode)(int cpu, const void *buf, size_t size); - int (*collect_cpu_info)(int cpu, struct cpu_signature *csig); - int (*apply_microcode)(int cpu); + int (*microcode_resume_match)(unsigned int cpu, const void *mc); + int (*cpu_request_microcode)(unsigned int cpu, const void *buf, + size_t size); + int (*collect_cpu_info)(unsigned int cpu, struct cpu_signature *csig); + int (*apply_microcode)(unsigned int cpu); int (*start_update)(void); }; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index b9a00aa..f507f5e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -570,7 +570,7 @@ int wrmsr_hypervisor_regs(uint32_t idx, uint64_t val); void microcode_set_module(unsigned int); int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); -int microcode_resume_cpu(int cpu); +int microcode_resume_cpu(unsigned int cpu); enum get_cpu_vendor { gcv_host_early, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55: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 1ZWjDX-000689-3N; Tue, 01 Sep 2015 10:55:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDW-00067u-Hd for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:06 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 10/6A-24494-90485E55; Tue, 01 Sep 2015 10:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1441104904!31884605!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9361 invoked from network); 1 Sep 2015 10:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDT-0001y2-4r for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDT-0004wl-00 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:03 +0000 Date: Tue, 01 Sep 2015 10:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/microcode: cleanup int type usage for cpu numbers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 901814d68bab33ee448970cf27b0f78328cab8a6 Author: Aravind Gopalakrishnan AuthorDate: Tue Aug 25 16:15:55 2015 +0200 Commit: Jan Beulich CommitDate: Tue Aug 25 16:15:55 2015 +0200 x86/microcode: cleanup int type usage for cpu numbers CPU numbers can't be negative. Fixing the microcode* files to properly use unsigned type in this patch. No functional change is introduced. Signed-off-by: Aravind Gopalakrishnan Acked-by: Jan Beulich Release-acked-by: Wei Liu --- xen/arch/x86/microcode.c | 6 +++--- xen/arch/x86/microcode_amd.c | 12 +++++++----- xen/arch/x86/microcode_intel.c | 15 ++++++++------- xen/include/asm-x86/microcode.h | 9 +++++---- xen/include/asm-x86/processor.h | 2 +- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c index 091d5d1..c20bde6 100644 --- a/xen/arch/x86/microcode.c +++ b/xen/arch/x86/microcode.c @@ -195,7 +195,7 @@ struct microcode_info { char buffer[1]; }; -static void __microcode_fini_cpu(int cpu) +static void __microcode_fini_cpu(unsigned int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); @@ -203,14 +203,14 @@ static void __microcode_fini_cpu(int cpu) memset(uci, 0, sizeof(*uci)); } -static void microcode_fini_cpu(int cpu) +static void microcode_fini_cpu(unsigned int cpu) { spin_lock(µcode_mutex); __microcode_fini_cpu(cpu); spin_unlock(µcode_mutex); } -int microcode_resume_cpu(int cpu) +int microcode_resume_cpu(unsigned int cpu) { int err; struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index f79b397..2717479 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -79,7 +79,7 @@ struct mpbhdr { static DEFINE_SPINLOCK(microcode_update_lock); /* See comment in start_update() for cases when this routine fails */ -static int collect_cpu_info(int cpu, struct cpu_signature *csig) +static int collect_cpu_info(unsigned int cpu, struct cpu_signature *csig) { struct cpuinfo_x86 *c = &cpu_data[cpu]; @@ -149,7 +149,8 @@ static bool_t find_equiv_cpu_id(const struct equiv_cpu_entry *equiv_cpu_table, return 0; } -static bool_t microcode_fits(const struct microcode_amd *mc_amd, int cpu) +static bool_t microcode_fits(const struct microcode_amd *mc_amd, + unsigned int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); const struct microcode_header_amd *mc_header = mc_amd->mpb; @@ -186,7 +187,7 @@ static bool_t microcode_fits(const struct microcode_amd *mc_amd, int cpu) return 1; } -static int apply_microcode(int cpu) +static int apply_microcode(unsigned int cpu) { unsigned long flags; struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); @@ -347,7 +348,8 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of return 0; } -static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) +static int cpu_request_microcode(unsigned int cpu, const void *buf, + size_t bufsize) { struct microcode_amd *mc_amd, *mc_old; size_t offset = 0; @@ -511,7 +513,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) return error; } -static int microcode_resume_match(int cpu, const void *mc) +static int microcode_resume_match(unsigned int cpu, const void *mc) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); struct microcode_amd *mc_amd = uci->mc.mc_amd; diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index b54cd71..0a5f403 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -90,7 +90,7 @@ struct extended_sigtable { /* serialize access to the physical write to MSR 0x79 */ static DEFINE_SPINLOCK(microcode_update_lock); -static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) +static int collect_cpu_info(unsigned int cpu_num, struct cpu_signature *csig) { struct cpuinfo_x86 *c = &cpu_data[cpu_num]; uint64_t msr_content; @@ -129,7 +129,7 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) } static inline int microcode_update_match( - int cpu_num, const struct microcode_header_intel *mc_header, + unsigned int cpu_num, const struct microcode_header_intel *mc_header, int sig, int pf) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu_num); @@ -232,7 +232,7 @@ static int microcode_sanity_check(void *mc) * return 1 - found update * return < 0 - error */ -static int get_matching_microcode(const void *mc, int cpu) +static int get_matching_microcode(const void *mc, unsigned int cpu) { struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); const struct microcode_header_intel *mc_header = mc; @@ -277,12 +277,12 @@ static int get_matching_microcode(const void *mc, int cpu) return 1; } -static int apply_microcode(int cpu) +static int apply_microcode(unsigned int cpu) { unsigned long flags; uint64_t msr_content; unsigned int val[2]; - int cpu_num = raw_smp_processor_id(); + unsigned int cpu_num = raw_smp_processor_id(); struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu_num); /* We should bind the task to the CPU */ @@ -351,7 +351,8 @@ static long get_next_ucode_from_buffer(void **mc, const u8 *buf, return offset + total_size; } -static int cpu_request_microcode(int cpu, const void *buf, size_t size) +static int cpu_request_microcode(unsigned int cpu, const void *buf, + size_t size) { long offset = 0; int error = 0; @@ -391,7 +392,7 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t size) return error; } -static int microcode_resume_match(int cpu, const void *mc) +static int microcode_resume_match(unsigned int cpu, const void *mc) { return get_matching_microcode(mc, cpu); } diff --git a/xen/include/asm-x86/microcode.h b/xen/include/asm-x86/microcode.h index 00a672a..23ea954 100644 --- a/xen/include/asm-x86/microcode.h +++ b/xen/include/asm-x86/microcode.h @@ -7,10 +7,11 @@ struct cpu_signature; struct ucode_cpu_info; struct microcode_ops { - int (*microcode_resume_match)(int cpu, const void *mc); - int (*cpu_request_microcode)(int cpu, const void *buf, size_t size); - int (*collect_cpu_info)(int cpu, struct cpu_signature *csig); - int (*apply_microcode)(int cpu); + int (*microcode_resume_match)(unsigned int cpu, const void *mc); + int (*cpu_request_microcode)(unsigned int cpu, const void *buf, + size_t size); + int (*collect_cpu_info)(unsigned int cpu, struct cpu_signature *csig); + int (*apply_microcode)(unsigned int cpu); int (*start_update)(void); }; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index b9a00aa..f507f5e 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -570,7 +570,7 @@ int wrmsr_hypervisor_regs(uint32_t idx, uint64_t val); void microcode_set_module(unsigned int); int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); -int microcode_resume_cpu(int cpu); +int microcode_resume_cpu(unsigned int cpu); enum get_cpu_vendor { gcv_host_early, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDi-0006Ah-69; Tue, 01 Sep 2015 10:55:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDh-0006AR-AY for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:17 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 75/7C-12371-41485E55; Tue, 01 Sep 2015 10:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1441104914!45749101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20769 invoked from network); 1 Sep 2015 10:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDe-0001yB-3g for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDd-0004xE-9K for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:13 +0000 Date: Tue, 01 Sep 2015 10:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: skip microcode updates for final levels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22c5675877c8209adcfdb6bceddb561320374529 Author: Aravind Gopalakrishnan AuthorDate: Tue Aug 25 16:17:13 2015 +0200 Commit: Jan Beulich CommitDate: Tue Aug 25 16:17:13 2015 +0200 x86, amd_ucode: skip microcode updates for final levels Some of older[Fam10h] systems require that certain number of applied microcode patch levels should not be overwritten by the microcode loader. Otherwise, system hangs are known to occur. The 'final_levels' of patch ids have been obtained empirically. Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 for details of the issue. The short version is that people have predominantly noticed system hang issues when trying to update microcode levels beyond the patch IDs below. [0x01000098, 0x0100009f, 0x010000af] From internal discussions, we gathered that OS/hypervisor cannot reliably perform microcode updates beyond these levels due to hardware issues. Therefore, we need to abort microcode update process if we hit any of these levels. In this patch, we check for those microcode versions and abort if the current core has one of those final patch levels applied by the BIOS A linux version of the patch has already made it into tip- http://marc.info/?l=linux-kernel&m=143703405627170 Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Release-acked-by: Wei Liu --- xen/arch/x86/microcode_amd.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 2717479..a61c926 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -348,6 +348,43 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of return 0; } +/* + * The 'final_levels' of patch ids have been obtained empirically. + * Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 + * for details of the issue. The short version is that people + * using certain Fam10h systems noticed system hang issues when + * trying to update microcode levels beyond the patch IDs below. + * From internal discussions, we gathered that OS/hypervisor + * cannot reliably perform microcode updates beyond these levels + * due to hardware issues. Therefore, we need to abort microcode + * update process if we hit any of these levels. + */ +static const unsigned int final_levels[] = { + 0x01000098, + 0x0100009f, + 0x010000af +}; + +static bool_t check_final_patch_levels(unsigned int cpu) +{ + /* + * Check the current patch levels on the cpu. If they are equal to + * any of the 'final_levels', then we should not update the microcode + * patch on the cpu as system will hang otherwise. + */ + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); + unsigned int i; + + if ( boot_cpu_data.x86 != 0x10 ) + return 0; + + for ( i = 0; i < ARRAY_SIZE(final_levels); i++ ) + if ( uci->cpu_sig.rev == final_levels[i] ) + return 1; + + return 0; +} + static int cpu_request_microcode(unsigned int cpu, const void *buf, size_t bufsize) { @@ -371,6 +408,14 @@ static int cpu_request_microcode(unsigned int cpu, const void *buf, goto out; } + if ( check_final_patch_levels(cpu) ) + { + printk(XENLOG_INFO + "microcode: Cannot update microcode patch on the cpu as we hit a final level\n"); + error = -EPERM; + goto out; + } + mc_amd = xmalloc(struct microcode_amd); if ( !mc_amd ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDi-0006Ah-69; Tue, 01 Sep 2015 10:55:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDh-0006AR-AY for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:17 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 75/7C-12371-41485E55; Tue, 01 Sep 2015 10:55:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1441104914!45749101!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20769 invoked from network); 1 Sep 2015 10:55:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDe-0001yB-3g for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDd-0004xE-9K for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:13 +0000 Date: Tue, 01 Sep 2015 10:55:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, amd_ucode: skip microcode updates for final levels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 22c5675877c8209adcfdb6bceddb561320374529 Author: Aravind Gopalakrishnan AuthorDate: Tue Aug 25 16:17:13 2015 +0200 Commit: Jan Beulich CommitDate: Tue Aug 25 16:17:13 2015 +0200 x86, amd_ucode: skip microcode updates for final levels Some of older[Fam10h] systems require that certain number of applied microcode patch levels should not be overwritten by the microcode loader. Otherwise, system hangs are known to occur. The 'final_levels' of patch ids have been obtained empirically. Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 for details of the issue. The short version is that people have predominantly noticed system hang issues when trying to update microcode levels beyond the patch IDs below. [0x01000098, 0x0100009f, 0x010000af] From internal discussions, we gathered that OS/hypervisor cannot reliably perform microcode updates beyond these levels due to hardware issues. Therefore, we need to abort microcode update process if we hit any of these levels. In this patch, we check for those microcode versions and abort if the current core has one of those final patch levels applied by the BIOS A linux version of the patch has already made it into tip- http://marc.info/?l=linux-kernel&m=143703405627170 Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Release-acked-by: Wei Liu --- xen/arch/x86/microcode_amd.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 2717479..a61c926 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -348,6 +348,43 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of return 0; } +/* + * The 'final_levels' of patch ids have been obtained empirically. + * Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 + * for details of the issue. The short version is that people + * using certain Fam10h systems noticed system hang issues when + * trying to update microcode levels beyond the patch IDs below. + * From internal discussions, we gathered that OS/hypervisor + * cannot reliably perform microcode updates beyond these levels + * due to hardware issues. Therefore, we need to abort microcode + * update process if we hit any of these levels. + */ +static const unsigned int final_levels[] = { + 0x01000098, + 0x0100009f, + 0x010000af +}; + +static bool_t check_final_patch_levels(unsigned int cpu) +{ + /* + * Check the current patch levels on the cpu. If they are equal to + * any of the 'final_levels', then we should not update the microcode + * patch on the cpu as system will hang otherwise. + */ + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); + unsigned int i; + + if ( boot_cpu_data.x86 != 0x10 ) + return 0; + + for ( i = 0; i < ARRAY_SIZE(final_levels); i++ ) + if ( uci->cpu_sig.rev == final_levels[i] ) + return 1; + + return 0; +} + static int cpu_request_microcode(unsigned int cpu, const void *buf, size_t bufsize) { @@ -371,6 +408,14 @@ static int cpu_request_microcode(unsigned int cpu, const void *buf, goto out; } + if ( check_final_patch_levels(cpu) ) + { + printk(XENLOG_INFO + "microcode: Cannot update microcode patch on the cpu as we hit a final level\n"); + error = -EPERM; + goto out; + } + mc_amd = xmalloc(struct microcode_amd); if ( !mc_amd ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10: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 1ZWjDr-0006D9-As; Tue, 01 Sep 2015 10:55:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDq-0006Ct-Lg for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:26 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id F5/89-10422-E1485E55; Tue, 01 Sep 2015 10:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1441104924!27783941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16582 invoked from network); 1 Sep 2015 10:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDo-0001z1-By for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDo-0004xk-8d for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:24 +0000 Date: Tue, 01 Sep 2015 10:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/IO-APIC: don't create pIRQ mapping from masked RTE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 669d4b85c433674ab3b52ef707af0d3a551c941f Author: Jan Beulich AuthorDate: Tue Aug 25 16:18:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue Aug 25 16:18:31 2015 +0200 x86/IO-APIC: don't create pIRQ mapping from masked RTE While moving our XenoLinux patches to 4.2-rc I noticed bogus "already mapped" messages resulting from Linux (legitimately) writing RTEs with only the mask bit set. Clearly we shouldn't even attempt to create a pIRQ <-> IRQ mapping from such RTEs. In the course of this I also found that the respective message isn't really useful without also printing the pre-existing mapping. And I noticed that map_domain_pirq() allowed IRQ0 to get through, despite us never allowing a domain to control that interrupt. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/io_apic.c | 26 +++++++++++++++++--------- xen/arch/x86/irq.c | 7 ++++--- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 7d4ee5d..b8e37b5 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2371,9 +2371,14 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) * pirq and irq mapping. Where the GSI is greater than 256, we assume * that dom0 pirq == irq. */ - pirq = (irq >= 256) ? irq : rte.vector; - if ( (pirq < 0) || (pirq >= hardware_domain->nr_pirqs) ) - return -EINVAL; + if ( !rte.mask ) + { + pirq = (irq >= 256) ? irq : rte.vector; + if ( pirq >= hardware_domain->nr_pirqs ) + return -EINVAL; + } + else + pirq = -1; if ( desc->action ) { @@ -2408,12 +2413,15 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) printk(XENLOG_INFO "allocated vector %02x for irq %d\n", ret, irq); } - spin_lock(&hardware_domain->event_lock); - ret = map_domain_pirq(hardware_domain, pirq, irq, - MAP_PIRQ_TYPE_GSI, NULL); - spin_unlock(&hardware_domain->event_lock); - if ( ret < 0 ) - return ret; + if ( pirq >= 0 ) + { + spin_lock(&hardware_domain->event_lock); + ret = map_domain_pirq(hardware_domain, pirq, irq, + MAP_PIRQ_TYPE_GSI, NULL); + spin_unlock(&hardware_domain->event_lock); + if ( ret < 0 ) + return ret; + } spin_lock_irqsave(&ioapic_lock, flags); /* Set the correct irq-handling type. */ diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 62fb319..bf2e822 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1906,7 +1906,7 @@ int map_domain_pirq( if ( !irq_access_permitted(current->domain, irq)) return -EPERM; - if ( pirq < 0 || pirq >= d->nr_pirqs || irq < 0 || irq >= nr_irqs ) + if ( pirq < 0 || pirq >= d->nr_pirqs || irq <= 0 || irq >= nr_irqs ) { dprintk(XENLOG_G_ERR, "dom%d: invalid pirq %d or irq %d\n", d->domain_id, pirq, irq); @@ -1919,8 +1919,9 @@ int map_domain_pirq( if ( (old_irq > 0 && (old_irq != irq) ) || (old_pirq && (old_pirq != pirq)) ) { - dprintk(XENLOG_G_WARNING, "dom%d: pirq %d or irq %d already mapped\n", - d->domain_id, pirq, irq); + dprintk(XENLOG_G_WARNING, + "dom%d: pirq %d or irq %d already mapped (%d,%d)\n", + d->domain_id, pirq, irq, old_pirq, old_irq); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10: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 1ZWjDr-0006D9-As; Tue, 01 Sep 2015 10:55:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDq-0006Ct-Lg for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:26 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id F5/89-10422-E1485E55; Tue, 01 Sep 2015 10:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1441104924!27783941!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16582 invoked from network); 1 Sep 2015 10:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDo-0001z1-By for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDo-0004xk-8d for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:24 +0000 Date: Tue, 01 Sep 2015 10:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/IO-APIC: don't create pIRQ mapping from masked RTE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 669d4b85c433674ab3b52ef707af0d3a551c941f Author: Jan Beulich AuthorDate: Tue Aug 25 16:18:31 2015 +0200 Commit: Jan Beulich CommitDate: Tue Aug 25 16:18:31 2015 +0200 x86/IO-APIC: don't create pIRQ mapping from masked RTE While moving our XenoLinux patches to 4.2-rc I noticed bogus "already mapped" messages resulting from Linux (legitimately) writing RTEs with only the mask bit set. Clearly we shouldn't even attempt to create a pIRQ <-> IRQ mapping from such RTEs. In the course of this I also found that the respective message isn't really useful without also printing the pre-existing mapping. And I noticed that map_domain_pirq() allowed IRQ0 to get through, despite us never allowing a domain to control that interrupt. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/io_apic.c | 26 +++++++++++++++++--------- xen/arch/x86/irq.c | 7 ++++--- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 7d4ee5d..b8e37b5 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2371,9 +2371,14 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) * pirq and irq mapping. Where the GSI is greater than 256, we assume * that dom0 pirq == irq. */ - pirq = (irq >= 256) ? irq : rte.vector; - if ( (pirq < 0) || (pirq >= hardware_domain->nr_pirqs) ) - return -EINVAL; + if ( !rte.mask ) + { + pirq = (irq >= 256) ? irq : rte.vector; + if ( pirq >= hardware_domain->nr_pirqs ) + return -EINVAL; + } + else + pirq = -1; if ( desc->action ) { @@ -2408,12 +2413,15 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) printk(XENLOG_INFO "allocated vector %02x for irq %d\n", ret, irq); } - spin_lock(&hardware_domain->event_lock); - ret = map_domain_pirq(hardware_domain, pirq, irq, - MAP_PIRQ_TYPE_GSI, NULL); - spin_unlock(&hardware_domain->event_lock); - if ( ret < 0 ) - return ret; + if ( pirq >= 0 ) + { + spin_lock(&hardware_domain->event_lock); + ret = map_domain_pirq(hardware_domain, pirq, irq, + MAP_PIRQ_TYPE_GSI, NULL); + spin_unlock(&hardware_domain->event_lock); + if ( ret < 0 ) + return ret; + } spin_lock_irqsave(&ioapic_lock, flags); /* Set the correct irq-handling type. */ diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 62fb319..bf2e822 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1906,7 +1906,7 @@ int map_domain_pirq( if ( !irq_access_permitted(current->domain, irq)) return -EPERM; - if ( pirq < 0 || pirq >= d->nr_pirqs || irq < 0 || irq >= nr_irqs ) + if ( pirq < 0 || pirq >= d->nr_pirqs || irq <= 0 || irq >= nr_irqs ) { dprintk(XENLOG_G_ERR, "dom%d: invalid pirq %d or irq %d\n", d->domain_id, pirq, irq); @@ -1919,8 +1919,9 @@ int map_domain_pirq( if ( (old_irq > 0 && (old_irq != irq) ) || (old_pirq && (old_pirq != pirq)) ) { - dprintk(XENLOG_G_WARNING, "dom%d: pirq %d or irq %d already mapped\n", - d->domain_id, pirq, irq); + dprintk(XENLOG_G_WARNING, + "dom%d: pirq %d or irq %d already mapped (%d,%d)\n", + d->domain_id, pirq, irq, old_pirq, old_irq); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10: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 1ZWjE3-0006GD-Di; Tue, 01 Sep 2015 10: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 1ZWjE1-0006Fg-SC for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:38 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 1D/8D-01753-92485E55; Tue, 01 Sep 2015 10:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1441104934!40035183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18981 invoked from network); 1 Sep 2015 10:55:35 -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; 1 Sep 2015 10:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDy-0001z9-Hv for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDy-0004yC-GV for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:34 +0000 Date: Tue, 01 Sep 2015 10:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] etherboot: Build fix for GCC 5.1.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6596412d59bcde3d1a2473f341851f4c476fc9df Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 24 15:48:58 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Aug 25 11:55:56 2015 -0400 etherboot: Build fix for GCC 5.1.1 Specificially we are pulling in the upstream patch (commit 1b56452121672e6408c38ac8926bdd6998a39004)): [ath9k] Remove confusing logic inversion in an ANI variable Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu --- tools/firmware/etherboot/patches/build_fix_4.patch | 225 ++++++++++++++++++++ tools/firmware/etherboot/patches/series | 1 + 2 files changed, 226 insertions(+), 0 deletions(-) diff --git a/tools/firmware/etherboot/patches/build_fix_4.patch b/tools/firmware/etherboot/patches/build_fix_4.patch new file mode 100644 index 0000000..9271c8c --- /dev/null +++ b/tools/firmware/etherboot/patches/build_fix_4.patch @@ -0,0 +1,225 @@ +From 1b56452121672e6408c38ac8926bdd6998a39004 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Thu, 23 Apr 2015 13:33:26 +0200 +Subject: [PATCH] [ath9k] Remove confusing logic inversion in an ANI variable + +This changed in Linux kernel the same way in commit 7067e701 +("ath9k_hw: remove confusing logic inversion in an ANI variable") by +Felix Fietkau. + +Additionally this fixes "error: logical not is only applied to the +left hand side of comparison" with GCC 5.1.0. + +Signed-off-by: Christian Hesse +Signed-off-by: Michael Brown +--- + src/drivers/net/ath/ath9k/ani.h | 2 +- + src/drivers/net/ath/ath9k/ath9k_ani.c | 16 ++++++++-------- + src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c | 18 +++++++++--------- + src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c | 12 ++++++------ + 4 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/src/drivers/net/ath/ath9k/ani.h b/src/drivers/net/ath/ath9k/ani.h +index dbd4d4d..ba87ba0 100644 +--- a/src/drivers/net/ath/ath9k/ani.h ++++ b/src/drivers/net/ath/ath9k/ani.h +@@ -125,7 +125,7 @@ struct ar5416AniState { + u8 mrcCCKOff; + u8 spurImmunityLevel; + u8 firstepLevel; +- u8 ofdmWeakSigDetectOff; ++ u8 ofdmWeakSigDetect; + u8 cckWeakSigThreshold; + u32 listenTime; + int32_t rssiThrLow; +diff --git a/src/drivers/net/ath/ath9k/ath9k_ani.c b/src/drivers/net/ath/ath9k/ath9k_ani.c +index ff7df49..76ca79c 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ani.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ani.c +@@ -177,7 +177,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + + rssi = BEACON_RSSI(ah); + if (rssi > aniState->rssiThrHigh) { +- if (!aniState->ofdmWeakSigDetectOff) { ++ if (aniState->ofdmWeakSigDetect) { + if (ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 0)) { +@@ -192,7 +192,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + return; + } + } else if (rssi > aniState->rssiThrLow) { +- if (aniState->ofdmWeakSigDetectOff) ++ if (!aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 1); +@@ -202,7 +202,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + return; + } else { + if ((ah->dev->channels + ah->dev->channel)->band == NET80211_BAND_2GHZ) { +- if (!aniState->ofdmWeakSigDetectOff) ++ if (aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 0); +@@ -360,7 +360,7 @@ static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah) + if (rssi > aniState->rssiThrHigh) { + /* XXX: Handle me */ + } else if (rssi > aniState->rssiThrLow) { +- if (aniState->ofdmWeakSigDetectOff) { ++ if (!aniState->ofdmWeakSigDetect) { + if (ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 1) == 1) +@@ -436,9 +436,9 @@ static void ath9k_ani_reset_old(struct ath_hw *ah) + if (aniState->spurImmunityLevel != 0) + ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, + aniState->spurImmunityLevel); +- if (aniState->ofdmWeakSigDetectOff) ++ if (!aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, +- !aniState->ofdmWeakSigDetectOff); ++ aniState->ofdmWeakSigDetect); + if (aniState->cckWeakSigThreshold) + ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR, + aniState->cckWeakSigThreshold); +@@ -709,8 +709,8 @@ void ath9k_hw_ani_init(struct ath_hw *ah) + + ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH; + ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW; +- ani->ofdmWeakSigDetectOff = +- !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ ani->ofdmWeakSigDetect = ++ ATH9K_ANI_USE_OFDM_WEAK_SIG; + ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL; + } + +diff --git a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c +index 60e87e9..2b6c133 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c +@@ -1141,12 +1141,12 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1215,10 +1215,10 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah, + + DBG2("ath9k: ANI parameters:\n"); + DBG2( +- "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetectOff=%d\n", ++ "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetect=%d\n", + aniState->noiseImmunityLevel, + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff); ++ aniState->ofdmWeakSigDetect); + DBG2( + "cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n", + aniState->cckWeakSigThreshold, +@@ -1307,18 +1307,18 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + DBG2("ath9k: " + "** ch %d: ofdm weak signal: %s=>%s\n", + chan->channel, +- !aniState->ofdmWeakSigDetectOff ? ++ aniState->ofdmWeakSigDetect ? + "on" : "off", + on ? "on" : "off"); + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1467,7 +1467,7 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah, + DBG2("ath9k: " + "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n", + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff ? "on" : "off", ++ aniState->ofdmWeakSigDetect ? "on" : "off", + aniState->firstepLevel, + !aniState->mrcCCKOff ? "on" : "off", + aniState->listenTime, +@@ -1554,7 +1554,7 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah) + /* these levels just got reset to defaults by the INI */ + aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW; + aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW; +- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG; + aniState->mrcCCKOff = 1; /* not available on pre AR9003 */ + } + +diff --git a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c +index 6103040..2244b77 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c +@@ -859,18 +859,18 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + DBG2("ath9k: " + "** ch %d: ofdm weak signal: %s=>%s\n", + chan->channel, +- !aniState->ofdmWeakSigDetectOff ? ++ aniState->ofdmWeakSigDetect ? + "on" : "off", + on ? "on" : "off"); + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1013,7 +1013,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + AR_PHY_MRC_CCK_ENABLE, is_on); + REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL, + AR_PHY_MRC_CCK_MUX_REG, is_on); +- if (!is_on != aniState->mrcCCKOff) { ++ if (!(is_on != aniState->mrcCCKOff)) { + DBG2("ath9k: " + "** ch %d: MRC CCK: %s=>%s\n", + chan->channel, +@@ -1037,7 +1037,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + DBG2("ath9k: " + "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n", + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff ? "on" : "off", ++ aniState->ofdmWeakSigDetect ? "on" : "off", + aniState->firstepLevel, + !aniState->mrcCCKOff ? "on" : "off", + aniState->listenTime, +@@ -1137,7 +1137,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah) + /* these levels just got reset to defaults by the INI */ + aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW; + aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW; +- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG; + aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK; + } + +-- +2.4.3 + diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series index 7512c14..2c39853 100644 --- a/tools/firmware/etherboot/patches/series +++ b/tools/firmware/etherboot/patches/series @@ -3,3 +3,4 @@ build_fix_1.patch build_fix_2.patch build_fix_3.patch build-compare.patch +build_fix_4.patch -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10: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 1ZWjE3-0006GD-Di; Tue, 01 Sep 2015 10: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 1ZWjE1-0006Fg-SC for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:38 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 1D/8D-01753-92485E55; Tue, 01 Sep 2015 10:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1441104934!40035183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18981 invoked from network); 1 Sep 2015 10:55:35 -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; 1 Sep 2015 10:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjDy-0001z9-Hv for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjDy-0004yC-GV for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:34 +0000 Date: Tue, 01 Sep 2015 10:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] etherboot: Build fix for GCC 5.1.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6596412d59bcde3d1a2473f341851f4c476fc9df Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 24 15:48:58 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Aug 25 11:55:56 2015 -0400 etherboot: Build fix for GCC 5.1.1 Specificially we are pulling in the upstream patch (commit 1b56452121672e6408c38ac8926bdd6998a39004)): [ath9k] Remove confusing logic inversion in an ANI variable Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu --- tools/firmware/etherboot/patches/build_fix_4.patch | 225 ++++++++++++++++++++ tools/firmware/etherboot/patches/series | 1 + 2 files changed, 226 insertions(+), 0 deletions(-) diff --git a/tools/firmware/etherboot/patches/build_fix_4.patch b/tools/firmware/etherboot/patches/build_fix_4.patch new file mode 100644 index 0000000..9271c8c --- /dev/null +++ b/tools/firmware/etherboot/patches/build_fix_4.patch @@ -0,0 +1,225 @@ +From 1b56452121672e6408c38ac8926bdd6998a39004 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Thu, 23 Apr 2015 13:33:26 +0200 +Subject: [PATCH] [ath9k] Remove confusing logic inversion in an ANI variable + +This changed in Linux kernel the same way in commit 7067e701 +("ath9k_hw: remove confusing logic inversion in an ANI variable") by +Felix Fietkau. + +Additionally this fixes "error: logical not is only applied to the +left hand side of comparison" with GCC 5.1.0. + +Signed-off-by: Christian Hesse +Signed-off-by: Michael Brown +--- + src/drivers/net/ath/ath9k/ani.h | 2 +- + src/drivers/net/ath/ath9k/ath9k_ani.c | 16 ++++++++-------- + src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c | 18 +++++++++--------- + src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c | 12 ++++++------ + 4 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/src/drivers/net/ath/ath9k/ani.h b/src/drivers/net/ath/ath9k/ani.h +index dbd4d4d..ba87ba0 100644 +--- a/src/drivers/net/ath/ath9k/ani.h ++++ b/src/drivers/net/ath/ath9k/ani.h +@@ -125,7 +125,7 @@ struct ar5416AniState { + u8 mrcCCKOff; + u8 spurImmunityLevel; + u8 firstepLevel; +- u8 ofdmWeakSigDetectOff; ++ u8 ofdmWeakSigDetect; + u8 cckWeakSigThreshold; + u32 listenTime; + int32_t rssiThrLow; +diff --git a/src/drivers/net/ath/ath9k/ath9k_ani.c b/src/drivers/net/ath/ath9k/ath9k_ani.c +index ff7df49..76ca79c 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ani.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ani.c +@@ -177,7 +177,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + + rssi = BEACON_RSSI(ah); + if (rssi > aniState->rssiThrHigh) { +- if (!aniState->ofdmWeakSigDetectOff) { ++ if (aniState->ofdmWeakSigDetect) { + if (ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 0)) { +@@ -192,7 +192,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + return; + } + } else if (rssi > aniState->rssiThrLow) { +- if (aniState->ofdmWeakSigDetectOff) ++ if (!aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 1); +@@ -202,7 +202,7 @@ static void ath9k_hw_ani_ofdm_err_trigger_old(struct ath_hw *ah) + return; + } else { + if ((ah->dev->channels + ah->dev->channel)->band == NET80211_BAND_2GHZ) { +- if (!aniState->ofdmWeakSigDetectOff) ++ if (aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 0); +@@ -360,7 +360,7 @@ static void ath9k_hw_ani_lower_immunity_old(struct ath_hw *ah) + if (rssi > aniState->rssiThrHigh) { + /* XXX: Handle me */ + } else if (rssi > aniState->rssiThrLow) { +- if (aniState->ofdmWeakSigDetectOff) { ++ if (!aniState->ofdmWeakSigDetect) { + if (ath9k_hw_ani_control(ah, + ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, + 1) == 1) +@@ -436,9 +436,9 @@ static void ath9k_ani_reset_old(struct ath_hw *ah) + if (aniState->spurImmunityLevel != 0) + ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, + aniState->spurImmunityLevel); +- if (aniState->ofdmWeakSigDetectOff) ++ if (!aniState->ofdmWeakSigDetect) + ath9k_hw_ani_control(ah, ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION, +- !aniState->ofdmWeakSigDetectOff); ++ aniState->ofdmWeakSigDetect); + if (aniState->cckWeakSigThreshold) + ath9k_hw_ani_control(ah, ATH9K_ANI_CCK_WEAK_SIGNAL_THR, + aniState->cckWeakSigThreshold); +@@ -709,8 +709,8 @@ void ath9k_hw_ani_init(struct ath_hw *ah) + + ani->rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH; + ani->rssiThrLow = ATH9K_ANI_RSSI_THR_LOW; +- ani->ofdmWeakSigDetectOff = +- !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ ani->ofdmWeakSigDetect = ++ ATH9K_ANI_USE_OFDM_WEAK_SIG; + ani->cckNoiseImmunityLevel = ATH9K_ANI_CCK_DEF_LEVEL; + } + +diff --git a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c +index 60e87e9..2b6c133 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ar5008_phy.c +@@ -1141,12 +1141,12 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1215,10 +1215,10 @@ static int ar5008_hw_ani_control_old(struct ath_hw *ah, + + DBG2("ath9k: ANI parameters:\n"); + DBG2( +- "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetectOff=%d\n", ++ "noiseImmunityLevel=%d, spurImmunityLevel=%d, ofdmWeakSigDetect=%d\n", + aniState->noiseImmunityLevel, + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff); ++ aniState->ofdmWeakSigDetect); + DBG2( + "cckWeakSigThreshold=%d, firstepLevel=%d, listenTime=%d\n", + aniState->cckWeakSigThreshold, +@@ -1307,18 +1307,18 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + DBG2("ath9k: " + "** ch %d: ofdm weak signal: %s=>%s\n", + chan->channel, +- !aniState->ofdmWeakSigDetectOff ? ++ aniState->ofdmWeakSigDetect ? + "on" : "off", + on ? "on" : "off"); + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1467,7 +1467,7 @@ static int ar5008_hw_ani_control_new(struct ath_hw *ah, + DBG2("ath9k: " + "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n", + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff ? "on" : "off", ++ aniState->ofdmWeakSigDetect ? "on" : "off", + aniState->firstepLevel, + !aniState->mrcCCKOff ? "on" : "off", + aniState->listenTime, +@@ -1554,7 +1554,7 @@ static void ar5008_hw_ani_cache_ini_regs(struct ath_hw *ah) + /* these levels just got reset to defaults by the INI */ + aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW; + aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW; +- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG; + aniState->mrcCCKOff = 1; /* not available on pre AR9003 */ + } + +diff --git a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c +index 6103040..2244b77 100644 +--- a/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c ++++ b/src/drivers/net/ath/ath9k/ath9k_ar9003_phy.c +@@ -859,18 +859,18 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + REG_CLR_BIT(ah, AR_PHY_SFCORR_LOW, + AR_PHY_SFCORR_LOW_USE_SELF_CORR_LOW); + +- if (!on != aniState->ofdmWeakSigDetectOff) { ++ if (on != aniState->ofdmWeakSigDetect) { + DBG2("ath9k: " + "** ch %d: ofdm weak signal: %s=>%s\n", + chan->channel, +- !aniState->ofdmWeakSigDetectOff ? ++ aniState->ofdmWeakSigDetect ? + "on" : "off", + on ? "on" : "off"); + if (on) + ah->stats.ast_ani_ofdmon++; + else + ah->stats.ast_ani_ofdmoff++; +- aniState->ofdmWeakSigDetectOff = !on; ++ aniState->ofdmWeakSigDetect = on; + } + break; + } +@@ -1013,7 +1013,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + AR_PHY_MRC_CCK_ENABLE, is_on); + REG_RMW_FIELD(ah, AR_PHY_MRC_CCK_CTRL, + AR_PHY_MRC_CCK_MUX_REG, is_on); +- if (!is_on != aniState->mrcCCKOff) { ++ if (!(is_on != aniState->mrcCCKOff)) { + DBG2("ath9k: " + "** ch %d: MRC CCK: %s=>%s\n", + chan->channel, +@@ -1037,7 +1037,7 @@ static int ar9003_hw_ani_control(struct ath_hw *ah, + DBG2("ath9k: " + "ANI parameters: SI=%d, ofdmWS=%s FS=%d MRCcck=%s listenTime=%d ofdmErrs=%d cckErrs=%d\n", + aniState->spurImmunityLevel, +- !aniState->ofdmWeakSigDetectOff ? "on" : "off", ++ aniState->ofdmWeakSigDetect ? "on" : "off", + aniState->firstepLevel, + !aniState->mrcCCKOff ? "on" : "off", + aniState->listenTime, +@@ -1137,7 +1137,7 @@ static void ar9003_hw_ani_cache_ini_regs(struct ath_hw *ah) + /* these levels just got reset to defaults by the INI */ + aniState->spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL_NEW; + aniState->firstepLevel = ATH9K_ANI_FIRSTEP_LVL_NEW; +- aniState->ofdmWeakSigDetectOff = !ATH9K_ANI_USE_OFDM_WEAK_SIG; ++ aniState->ofdmWeakSigDetect = ATH9K_ANI_USE_OFDM_WEAK_SIG; + aniState->mrcCCKOff = !ATH9K_ANI_ENABLE_MRC_CCK; + } + +-- +2.4.3 + diff --git a/tools/firmware/etherboot/patches/series b/tools/firmware/etherboot/patches/series index 7512c14..2c39853 100644 --- a/tools/firmware/etherboot/patches/series +++ b/tools/firmware/etherboot/patches/series @@ -3,3 +3,4 @@ build_fix_1.patch build_fix_2.patch build_fix_3.patch build-compare.patch +build_fix_4.patch -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEC-0006Ia-IQ; Tue, 01 Sep 2015 10:55:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEB-0006ID-Gy for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:47 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id D3/FF-28791-23485E55; Tue, 01 Sep 2015 10:55:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1441104944!45759571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16081 invoked from network); 1 Sep 2015 10:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjE8-0001zH-NU for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjE8-0004yZ-Lz for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:44 +0000 Date: Tue, 01 Sep 2015 10:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: don't flag non-maskable entries as host-masked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bde63cd088b7d9fa99b8ed6d110cd768f87bbc60 Author: Jan Beulich AuthorDate: Thu Aug 27 17:39:37 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 17:39:37 2015 +0200 x86/MSI: don't flag non-maskable entries as host-masked 'M' debug key output looks confusing without this adjustment. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e71e19f..588305a 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -716,8 +716,8 @@ static int msi_capability_init(struct pci_dev *dev, entry[i].msi_attrib.type = PCI_CAP_ID_MSI; entry[i].msi_attrib.is_64 = is_64bit_address(control); entry[i].msi_attrib.entry_nr = i; + entry[i].msi_attrib.host_masked = entry[i].msi_attrib.maskbit = is_mask_bit_support(control); - entry[i].msi_attrib.host_masked = 1; entry[i].msi_attrib.guest_masked = 0; entry[i].msi_attrib.pos = pos; if ( entry[i].msi_attrib.maskbit ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEC-0006Ia-IQ; Tue, 01 Sep 2015 10:55:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEB-0006ID-Gy for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:47 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id D3/FF-28791-23485E55; Tue, 01 Sep 2015 10:55:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1441104944!45759571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16081 invoked from network); 1 Sep 2015 10:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjE8-0001zH-NU for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjE8-0004yZ-Lz for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:44 +0000 Date: Tue, 01 Sep 2015 10:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: don't flag non-maskable entries as host-masked X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bde63cd088b7d9fa99b8ed6d110cd768f87bbc60 Author: Jan Beulich AuthorDate: Thu Aug 27 17:39:37 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 17:39:37 2015 +0200 x86/MSI: don't flag non-maskable entries as host-masked 'M' debug key output looks confusing without this adjustment. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/msi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index e71e19f..588305a 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -716,8 +716,8 @@ static int msi_capability_init(struct pci_dev *dev, entry[i].msi_attrib.type = PCI_CAP_ID_MSI; entry[i].msi_attrib.is_64 = is_64bit_address(control); entry[i].msi_attrib.entry_nr = i; + entry[i].msi_attrib.host_masked = entry[i].msi_attrib.maskbit = is_mask_bit_support(control); - entry[i].msi_attrib.host_masked = 1; entry[i].msi_attrib.guest_masked = 0; entry[i].msi_attrib.pos = pos; if ( entry[i].msi_attrib.maskbit ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEM-0006Ki-LV; Tue, 01 Sep 2015 10:55:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEL-0006KH-EZ for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:57 +0000 Content-Length: 1603 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id AD/60-00475-C3485E55; Tue, 01 Sep 2015 10:55:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1441104955!45769312!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20481 invoked from network); 1 Sep 2015 10:55:55 -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; 1 Sep 2015 10:55:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEI-0001zP-T5 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEI-0004z5-Rl for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:54 +0000 Date: Tue, 01 Sep 2015 10:55:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU: skip domains without page tables when dumping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1236851865513840244==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1236851865513840244== Content-Length: 1182 Content-Transfer-Encoding: quoted-printable commit 5f335544cf5b716b0af51223e33373c4a7d65e8c Author: Jan Beulich AuthorDate: Thu Aug 27 17:40:38 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 17:40:38 2015 +0200 IOMMU: skip domains without page tables when dumping Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich Tested-by: Roger Pau Monn=C3=A9 Release-acked-by: Wei Liu --- xen/drivers/passthrough/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index fc7831e..d5137733 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -411,7 +411,7 @@ static void iommu_dump_p2m_table(unsigned char key) ops =3D iommu_get_ops(); for_each_domain(d) { - if ( is_hardware_domain(d) ) + if ( is_hardware_domain(d) || need_iommu(d) <=3D 0 ) continue; if ( iommu_use_hap_pt(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1236851865513840244== 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 --===============1236851865513840244==-- From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:55:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:55:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEM-0006Ki-LV; Tue, 01 Sep 2015 10:55:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEL-0006KH-EZ for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:57 +0000 Content-Length: 1603 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id AD/60-00475-C3485E55; Tue, 01 Sep 2015 10:55:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1441104955!45769312!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20481 invoked from network); 1 Sep 2015 10:55:55 -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; 1 Sep 2015 10:55:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEI-0001zP-T5 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEI-0004z5-Rl for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:55:54 +0000 Date: Tue, 01 Sep 2015 10:55:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU: skip domains without page tables when dumping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1236851865513840244==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1236851865513840244== Content-Length: 1182 Content-Transfer-Encoding: quoted-printable commit 5f335544cf5b716b0af51223e33373c4a7d65e8c Author: Jan Beulich AuthorDate: Thu Aug 27 17:40:38 2015 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 17:40:38 2015 +0200 IOMMU: skip domains without page tables when dumping Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich Tested-by: Roger Pau Monn=C3=A9 Release-acked-by: Wei Liu --- xen/drivers/passthrough/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index fc7831e..d5137733 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -411,7 +411,7 @@ static void iommu_dump_p2m_table(unsigned char key) ops =3D iommu_get_ops(); for_each_domain(d) { - if ( is_hardware_domain(d) ) + if ( is_hardware_domain(d) || need_iommu(d) <=3D 0 ) continue; if ( iommu_use_hap_pt(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1236851865513840244== 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 --===============1236851865513840244==-- From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56: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 1ZWjEZ-0006Nb-OY; Tue, 01 Sep 2015 10:56:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEY-0006NB-Ag for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:10 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id DF/A0-10715-94485E55; Tue, 01 Sep 2015 10:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1441104965!45749419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7149 invoked from network); 1 Sep 2015 10:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjET-000200-6z for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjET-000506-04 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:05 +0000 Date: Tue, 01 Sep 2015 10:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: fix tarball stubdom build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0cc73e9870a96e18fc076618c0b419919794ae06 Author: Wei Liu AuthorDate: Thu Aug 27 16:54:01 2015 +0100 Commit: Ian Jackson CommitDate: Thu Aug 27 18:59:11 2015 +0100 build: fix tarball stubdom build When we create a source code tarball, mini-os is extracted to extras/mini-os directory. When building a source code tarball, we shouldn't clone mini-os again. Only clone mini-os when that directory doesn't exist. This fixes tarball build and doesn't affect non-tarball build. Signed-off-by: Wei Liu Acked-by: Ian Jackson Cc: Ian Campbell --- Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8a75ff..ba0df70 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,12 @@ include Config.mk .PHONY: mini-os-dir mini-os-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ - $(MINIOS_UPSTREAM_URL) \ - $(MINIOS_UPSTREAM_REVISION) \ - $(XEN_ROOT)/extras/mini-os + if [ ! -d $(XEN_ROOT)/extras/mini-os ]; then \ + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ + $(MINIOS_UPSTREAM_URL) \ + $(MINIOS_UPSTREAM_REVISION) \ + $(XEN_ROOT)/extras/mini-os ; \ + fi .PHONY: mini-os-dir-force-update mini-os-dir-force-update: mini-os-dir -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56: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 1ZWjEZ-0006Nb-OY; Tue, 01 Sep 2015 10:56:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEY-0006NB-Ag for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:10 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id DF/A0-10715-94485E55; Tue, 01 Sep 2015 10:56:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1441104965!45749419!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7149 invoked from network); 1 Sep 2015 10:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjET-000200-6z for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjET-000506-04 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:05 +0000 Date: Tue, 01 Sep 2015 10:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: fix tarball stubdom build X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0cc73e9870a96e18fc076618c0b419919794ae06 Author: Wei Liu AuthorDate: Thu Aug 27 16:54:01 2015 +0100 Commit: Ian Jackson CommitDate: Thu Aug 27 18:59:11 2015 +0100 build: fix tarball stubdom build When we create a source code tarball, mini-os is extracted to extras/mini-os directory. When building a source code tarball, we shouldn't clone mini-os again. Only clone mini-os when that directory doesn't exist. This fixes tarball build and doesn't affect non-tarball build. Signed-off-by: Wei Liu Acked-by: Ian Jackson Cc: Ian Campbell --- Makefile | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8a75ff..ba0df70 100644 --- a/Makefile +++ b/Makefile @@ -19,10 +19,12 @@ include Config.mk .PHONY: mini-os-dir mini-os-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ - $(MINIOS_UPSTREAM_URL) \ - $(MINIOS_UPSTREAM_REVISION) \ - $(XEN_ROOT)/extras/mini-os + if [ ! -d $(XEN_ROOT)/extras/mini-os ]; then \ + GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh \ + $(MINIOS_UPSTREAM_URL) \ + $(MINIOS_UPSTREAM_REVISION) \ + $(XEN_ROOT)/extras/mini-os ; \ + fi .PHONY: mini-os-dir-force-update mini-os-dir-force-update: mini-os-dir -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56: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 1ZWjEg-0006PI-Qw; Tue, 01 Sep 2015 10:56:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEf-0006P8-PV for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:17 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 40/6E-06021-15485E55; Tue, 01 Sep 2015 10:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1441104975!39924571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31685 invoked from network); 1 Sep 2015 10:56: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; 1 Sep 2015 10:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEd-00020B-DD for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEd-00050S-CX for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:15 +0000 Date: Tue, 01 Sep 2015 10:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: use correct qemu emulator binary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07e43fa0b973f7a4cb4b590294b36035607146c4 Author: Doug Goldstein AuthorDate: Tue Aug 25 13:49:49 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:09:26 2015 +0100 build: use correct qemu emulator binary Per http://wiki.qemu.org/ChangeLog/1.0 and the fact that no currently supported distro ships the x86 system emulator binary as 'qemu', this changes the default when a user specifies --with-system-qemu without a PATH to 'qemu-system-i386', otherwise the default results in a non-functional setup. [ Reran autogen.sh -iwj ] Signed-off-by: Doug Goldstein Acked-by: Wei Liu --- tools/configure | 2 +- tools/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure b/tools/configure index 1098f1f..428b3a5 100755 --- a/tools/configure +++ b/tools/configure @@ -4265,7 +4265,7 @@ if test "${with_system_qemu+set}" = set; then : withval=$with_system_qemu; case $withval in yes) - qemu_xen=n ; qemu_xen_path="qemu" + qemu_xen=n ; qemu_xen_path="qemu-system-i386" qemu_xen_systemd="/usr/bin/env $qemu_xen_path" ;; no) qemu_xen=y ;; diff --git a/tools/configure.ac b/tools/configure.ac index c1fa658..7daec99 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -177,7 +177,7 @@ AC_ARG_WITH([system-qemu], device model instead of building and installing our own version]),[ case $withval in yes) - qemu_xen=n ; qemu_xen_path="qemu" + qemu_xen=n ; qemu_xen_path="qemu-system-i386" qemu_xen_systemd="/usr/bin/env $qemu_xen_path" ;; no) qemu_xen=y ;; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56: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 1ZWjEg-0006PI-Qw; Tue, 01 Sep 2015 10:56:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEf-0006P8-PV for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:17 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 40/6E-06021-15485E55; Tue, 01 Sep 2015 10:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1441104975!39924571!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31685 invoked from network); 1 Sep 2015 10:56: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; 1 Sep 2015 10:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEd-00020B-DD for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEd-00050S-CX for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:15 +0000 Date: Tue, 01 Sep 2015 10:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: use correct qemu emulator binary X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07e43fa0b973f7a4cb4b590294b36035607146c4 Author: Doug Goldstein AuthorDate: Tue Aug 25 13:49:49 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:09:26 2015 +0100 build: use correct qemu emulator binary Per http://wiki.qemu.org/ChangeLog/1.0 and the fact that no currently supported distro ships the x86 system emulator binary as 'qemu', this changes the default when a user specifies --with-system-qemu without a PATH to 'qemu-system-i386', otherwise the default results in a non-functional setup. [ Reran autogen.sh -iwj ] Signed-off-by: Doug Goldstein Acked-by: Wei Liu --- tools/configure | 2 +- tools/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/configure b/tools/configure index 1098f1f..428b3a5 100755 --- a/tools/configure +++ b/tools/configure @@ -4265,7 +4265,7 @@ if test "${with_system_qemu+set}" = set; then : withval=$with_system_qemu; case $withval in yes) - qemu_xen=n ; qemu_xen_path="qemu" + qemu_xen=n ; qemu_xen_path="qemu-system-i386" qemu_xen_systemd="/usr/bin/env $qemu_xen_path" ;; no) qemu_xen=y ;; diff --git a/tools/configure.ac b/tools/configure.ac index c1fa658..7daec99 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -177,7 +177,7 @@ AC_ARG_WITH([system-qemu], device model instead of building and installing our own version]),[ case $withval in yes) - qemu_xen=n ; qemu_xen_path="qemu" + qemu_xen=n ; qemu_xen_path="qemu-system-i386" qemu_xen_systemd="/usr/bin/env $qemu_xen_path" ;; no) qemu_xen=y ;; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEs-0006Tr-Ti; Tue, 01 Sep 2015 10:56:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEr-0006RW-A9 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:29 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 46/31-10715-C5485E55; Tue, 01 Sep 2015 10:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1441104985!45668608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21174 invoked from network); 1 Sep 2015 10:56:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEn-00020J-L9 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEn-00050p-HX for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:25 +0000 Date: Tue, 01 Sep 2015 10:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move misc README's into docs/misc/ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c85d3d1d98a6e55a9f4bc55db03bdff3e6bbd796 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:17 2015 +0100 docs: Move misc README's into docs/misc/ To live with the other documentation. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/misc/stubdom.txt | 93 ++++++++++++++++++++++++++++++++++++++++ docs/misc/xenmon.txt | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ stubdom/Makefile | 6 +-- stubdom/README | 93 ---------------------------------------- tools/xenmon/Makefile | 2 - tools/xenmon/README | 114 ------------------------------------------------- 6 files changed, 208 insertions(+), 214 deletions(-) diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt new file mode 100644 index 0000000..de7b6c7 --- /dev/null +++ b/docs/misc/stubdom.txt @@ -0,0 +1,93 @@ + IOEMU stubdom + ============= + + This boosts HVM performance by putting ioemu in its own lightweight domain. + +General Configuration +===================== + +Due to a race between the creation of the IOEMU stubdomain itself and allocation +of video memory for the HVM domain, you need to avoid the need for ballooning, +by using the hypervisor dom0_mem= option for instance. + +Using with XL +------------- + +The enable IOEMU stub domains set the following in your domain +config: + + device_model_stubdomain_override = 1 + +See xl.cfg(5) for more details of the xl domain configuration syntax +and http://wiki.xen.org/wiki/Device_Model_Stub_Domains for more +information on device model stub domains + + + PV-GRUB + ======= + + This replaces pygrub to boot domU images safely: it runs the regular grub +inside the created domain itself and uses regular domU facilities to read the +disk / fetch files from network etc. ; it eventually loads the PV kernel and +chain-boots it. + +Configuration +============= + +In your PV config, + +- use pv-grub.gz as kernel: + +kernel = "pv-grub.gz" + +- set the path to menu.lst, as seen from the domU, in extra: + +extra = "(hd0,0)/boot/grub/menu.lst" + +or you can provide the content of a menu.lst stored in dom0 by passing it as a +ramdisk: + +ramdisk = "/boot/domU-1-menu.lst" + +or you can also use a tftp path (dhcp will be automatically performed): + +extra = "(nd)/somepath/menu.lst" + +or you can set it in option 150 of your dhcp server and leave extra and ramdisk +empty (dhcp will be automatically performed) + +Limitations +=========== + +- You can not boot a 64bit kernel with a 32bit-compiled PV-GRUB and vice-versa. +To cross-compile a 32bit PV-GRUB, + +export XEN_TARGET_ARCH=x86_32 + +- bootsplash is supported, but the ioemu backend does not yet support restart +for use by the booted kernel. + +- PV-GRUB doesn't support virtualized partitions. For instance: + +disk = [ 'phy:hda7,hda7,w' ] + +will be seen by PV-GRUB as (hd0), not (hd0,6), since GRUB will not see any +partition table. + + + Your own stubdom + ================ + + By running + +cd stubdom/ +make c-stubdom + + or + +cd stubdom/ +make caml-stubdom + + you can compile examples of C or caml stub domain kernels. You can use these +and the relevant Makefile rules as basis to build your own stub domain kernel. +Available libraries are libc, libxc, libxs, zlib and libpci. diff --git a/docs/misc/xenmon.txt b/docs/misc/xenmon.txt new file mode 100644 index 0000000..3393f5b --- /dev/null +++ b/docs/misc/xenmon.txt @@ -0,0 +1,114 @@ +Xen Performance Monitor +----------------------- + +The xenmon tools make use of the existing xen tracing feature to provide fine +grained reporting of various domain related metrics. It should be stressed that +the xenmon.py script included here is just an example of the data that may be +displayed. The xenbake demon keeps a large amount of history in a shared memory +area that may be accessed by tools such as xenmon. + +For each domain, xenmon reports various metrics. One part of the display is a +group of metrics that have been accumulated over the last second, while another +part of the display shows data measured over 10 seconds. Other measurement +intervals are possible, but we have just chosen 1s and 10s as an example. + + +Execution Count +--------------- + o The number of times that a domain was scheduled to run (ie, dispatched) over + the measurement interval + + +CPU usage +--------- + o Total time used over the measurement interval + o Usage expressed as a percentage of the measurement interval + o Average cpu time used during each execution of the domain + + +Waiting time +------------ +This is how much time the domain spent waiting to run, or put another way, the +amount of time the domain spent in the "runnable" state (or on the run queue) +but not actually running. Xenmon displays: + + o Total time waiting over the measurement interval + o Wait time expressed as a percentage of the measurement interval + o Average waiting time for each execution of the domain + +Blocked time +------------ +This is how much time the domain spent blocked (or sleeping); Put another way, +the amount of time the domain spent not needing/wanting the cpu because it was +waiting for some event (ie, I/O). Xenmon reports: + + o Total time blocked over the measurement interval + o Blocked time expressed as a percentage of the measurement interval + o Blocked time per I/O (see I/O count below) + +Allocation time +--------------- +This is how much cpu time was allocated to the domain by the scheduler; This is +distinct from cpu usage since the "time slice" given to a domain is frequently +cut short for one reason or another, ie, the domain requests I/O and blocks. +Xenmon reports: + + o Average allocation time per execution (ie, time slice) + o Min and Max allocation times + +I/O Count +--------- +This is a rough measure of I/O requested by the domain. The number of page +exchanges (or page "flips") between the domain and dom0 are counted. The +number of pages exchanged may not accurately reflect the number of bytes +transferred to/from a domain due to partial pages being used by the network +protocols, etc. But it does give a good sense of the magnitude of I/O being +requested by a domain. Xenmon reports: + + o Total number of page exchanges during the measurement interval + o Average number of page exchanges per execution of the domain + + +Usage Notes and issues +---------------------- + - Start xenmon by simply running xenmon.py; The xenbake demon is started and + stopped automatically by xenmon. + - To see the various options for xenmon, run xenmon -h. Ditto for xenbaked. + - xenmon also has an option (-n) to output log data to a file instead of the + curses interface. + - NDOMAINS is defined to be 32, but can be changed by recompiling xenbaked + - Xenmon.py appears to create 1-2% cpu overhead; Part of this is just the + overhead of the python interpreter. Part of it may be the number of trace + records being generated. The number of trace records generated can be + limited by setting the trace mask (with a dom0 Op), which controls which + events cause a trace record to be emitted. + - To exit xenmon, type 'q' + - To cycle the display to other physical cpu's, type 'c' + - The first time xenmon is run, it attempts to allocate xen trace buffers + using a default size. If you wish to use a non-default value for the + trace buffer size, run the 'setsize' program (located in tools/xentrace) + and specify the number of memory pages as a parameter. The default is 20. + - Not well tested with domains using more than 1 virtual cpu + - If you create a lot of domains, or repeatedly kill a domain and restart it, + and the domain id's get to be bigger than NDOMAINS, then xenmon behaves badly. + This is a bug that is due to xenbaked's treatment of domain id's vs. domain + indices in a data array. Will be fixed in a future release; Workaround: + Increase NDOMAINS in xenbaked and rebuild. + +Future Work +----------- +o RPC interface to allow external entities to programmatically access processed data +o I/O Count batching to reduce number of trace records generated + +Case Study +---------- +We have written a case study which demonstrates some of the usefulness of +this tool and the metrics reported. It is available at: +http://www.hpl.hp.com/techreports/2005/HPL-2005-187.html + +Authors +------- +Diwaker Gupta +Rob Gardner +Lucy Cherkasova + diff --git a/stubdom/Makefile b/stubdom/Makefile index faa7c21..e1359cf 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -463,15 +463,11 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore ######### ifeq ($(STUBDOM_SUPPORTED),1) -install: $(STUBDOMPATH) install-readme $(STUBDOM_INSTALL) +install: $(STUBDOMPATH) $(STUBDOM_INSTALL) else install: $(STUBDOMPATH) endif -install-readme: - $(INSTALL_DIR) $(DESTDIR)$(docdir) - $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.stubdom - install-ioemu: ioemu-stubdom $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)" diff --git a/stubdom/README b/stubdom/README deleted file mode 100644 index de7b6c7..0000000 --- a/stubdom/README +++ /dev/null @@ -1,93 +0,0 @@ - IOEMU stubdom - ============= - - This boosts HVM performance by putting ioemu in its own lightweight domain. - -General Configuration -===================== - -Due to a race between the creation of the IOEMU stubdomain itself and allocation -of video memory for the HVM domain, you need to avoid the need for ballooning, -by using the hypervisor dom0_mem= option for instance. - -Using with XL -------------- - -The enable IOEMU stub domains set the following in your domain -config: - - device_model_stubdomain_override = 1 - -See xl.cfg(5) for more details of the xl domain configuration syntax -and http://wiki.xen.org/wiki/Device_Model_Stub_Domains for more -information on device model stub domains - - - PV-GRUB - ======= - - This replaces pygrub to boot domU images safely: it runs the regular grub -inside the created domain itself and uses regular domU facilities to read the -disk / fetch files from network etc. ; it eventually loads the PV kernel and -chain-boots it. - -Configuration -============= - -In your PV config, - -- use pv-grub.gz as kernel: - -kernel = "pv-grub.gz" - -- set the path to menu.lst, as seen from the domU, in extra: - -extra = "(hd0,0)/boot/grub/menu.lst" - -or you can provide the content of a menu.lst stored in dom0 by passing it as a -ramdisk: - -ramdisk = "/boot/domU-1-menu.lst" - -or you can also use a tftp path (dhcp will be automatically performed): - -extra = "(nd)/somepath/menu.lst" - -or you can set it in option 150 of your dhcp server and leave extra and ramdisk -empty (dhcp will be automatically performed) - -Limitations -=========== - -- You can not boot a 64bit kernel with a 32bit-compiled PV-GRUB and vice-versa. -To cross-compile a 32bit PV-GRUB, - -export XEN_TARGET_ARCH=x86_32 - -- bootsplash is supported, but the ioemu backend does not yet support restart -for use by the booted kernel. - -- PV-GRUB doesn't support virtualized partitions. For instance: - -disk = [ 'phy:hda7,hda7,w' ] - -will be seen by PV-GRUB as (hd0), not (hd0,6), since GRUB will not see any -partition table. - - - Your own stubdom - ================ - - By running - -cd stubdom/ -make c-stubdom - - or - -cd stubdom/ -make caml-stubdom - - you can compile examples of C or caml stub domain kernels. You can use these -and the relevant Makefile rules as basis to build your own stub domain kernel. -Available libraries are libc, libxc, libxs, zlib and libpci. diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index 5095682..20ea100 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -31,8 +31,6 @@ install: build $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py - $(INSTALL_DIR) $(DESTDIR)$(docdir) - $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.xenmon .PHONY: clean clean: diff --git a/tools/xenmon/README b/tools/xenmon/README deleted file mode 100644 index 3393f5b..0000000 --- a/tools/xenmon/README +++ /dev/null @@ -1,114 +0,0 @@ -Xen Performance Monitor ------------------------ - -The xenmon tools make use of the existing xen tracing feature to provide fine -grained reporting of various domain related metrics. It should be stressed that -the xenmon.py script included here is just an example of the data that may be -displayed. The xenbake demon keeps a large amount of history in a shared memory -area that may be accessed by tools such as xenmon. - -For each domain, xenmon reports various metrics. One part of the display is a -group of metrics that have been accumulated over the last second, while another -part of the display shows data measured over 10 seconds. Other measurement -intervals are possible, but we have just chosen 1s and 10s as an example. - - -Execution Count ---------------- - o The number of times that a domain was scheduled to run (ie, dispatched) over - the measurement interval - - -CPU usage ---------- - o Total time used over the measurement interval - o Usage expressed as a percentage of the measurement interval - o Average cpu time used during each execution of the domain - - -Waiting time ------------- -This is how much time the domain spent waiting to run, or put another way, the -amount of time the domain spent in the "runnable" state (or on the run queue) -but not actually running. Xenmon displays: - - o Total time waiting over the measurement interval - o Wait time expressed as a percentage of the measurement interval - o Average waiting time for each execution of the domain - -Blocked time ------------- -This is how much time the domain spent blocked (or sleeping); Put another way, -the amount of time the domain spent not needing/wanting the cpu because it was -waiting for some event (ie, I/O). Xenmon reports: - - o Total time blocked over the measurement interval - o Blocked time expressed as a percentage of the measurement interval - o Blocked time per I/O (see I/O count below) - -Allocation time ---------------- -This is how much cpu time was allocated to the domain by the scheduler; This is -distinct from cpu usage since the "time slice" given to a domain is frequently -cut short for one reason or another, ie, the domain requests I/O and blocks. -Xenmon reports: - - o Average allocation time per execution (ie, time slice) - o Min and Max allocation times - -I/O Count ---------- -This is a rough measure of I/O requested by the domain. The number of page -exchanges (or page "flips") between the domain and dom0 are counted. The -number of pages exchanged may not accurately reflect the number of bytes -transferred to/from a domain due to partial pages being used by the network -protocols, etc. But it does give a good sense of the magnitude of I/O being -requested by a domain. Xenmon reports: - - o Total number of page exchanges during the measurement interval - o Average number of page exchanges per execution of the domain - - -Usage Notes and issues ----------------------- - - Start xenmon by simply running xenmon.py; The xenbake demon is started and - stopped automatically by xenmon. - - To see the various options for xenmon, run xenmon -h. Ditto for xenbaked. - - xenmon also has an option (-n) to output log data to a file instead of the - curses interface. - - NDOMAINS is defined to be 32, but can be changed by recompiling xenbaked - - Xenmon.py appears to create 1-2% cpu overhead; Part of this is just the - overhead of the python interpreter. Part of it may be the number of trace - records being generated. The number of trace records generated can be - limited by setting the trace mask (with a dom0 Op), which controls which - events cause a trace record to be emitted. - - To exit xenmon, type 'q' - - To cycle the display to other physical cpu's, type 'c' - - The first time xenmon is run, it attempts to allocate xen trace buffers - using a default size. If you wish to use a non-default value for the - trace buffer size, run the 'setsize' program (located in tools/xentrace) - and specify the number of memory pages as a parameter. The default is 20. - - Not well tested with domains using more than 1 virtual cpu - - If you create a lot of domains, or repeatedly kill a domain and restart it, - and the domain id's get to be bigger than NDOMAINS, then xenmon behaves badly. - This is a bug that is due to xenbaked's treatment of domain id's vs. domain - indices in a data array. Will be fixed in a future release; Workaround: - Increase NDOMAINS in xenbaked and rebuild. - -Future Work ------------ -o RPC interface to allow external entities to programmatically access processed data -o I/O Count batching to reduce number of trace records generated - -Case Study ----------- -We have written a case study which demonstrates some of the usefulness of -this tool and the metrics reported. It is available at: -http://www.hpl.hp.com/techreports/2005/HPL-2005-187.html - -Authors -------- -Diwaker Gupta -Rob Gardner -Lucy Cherkasova - -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEs-0006Tr-Ti; Tue, 01 Sep 2015 10:56:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEr-0006RW-A9 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:29 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 46/31-10715-C5485E55; Tue, 01 Sep 2015 10:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1441104985!45668608!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21174 invoked from network); 1 Sep 2015 10:56:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEn-00020J-L9 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEn-00050p-HX for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:25 +0000 Date: Tue, 01 Sep 2015 10:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move misc README's into docs/misc/ X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c85d3d1d98a6e55a9f4bc55db03bdff3e6bbd796 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:17 2015 +0100 docs: Move misc README's into docs/misc/ To live with the other documentation. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/misc/stubdom.txt | 93 ++++++++++++++++++++++++++++++++++++++++ docs/misc/xenmon.txt | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ stubdom/Makefile | 6 +-- stubdom/README | 93 ---------------------------------------- tools/xenmon/Makefile | 2 - tools/xenmon/README | 114 ------------------------------------------------- 6 files changed, 208 insertions(+), 214 deletions(-) diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt new file mode 100644 index 0000000..de7b6c7 --- /dev/null +++ b/docs/misc/stubdom.txt @@ -0,0 +1,93 @@ + IOEMU stubdom + ============= + + This boosts HVM performance by putting ioemu in its own lightweight domain. + +General Configuration +===================== + +Due to a race between the creation of the IOEMU stubdomain itself and allocation +of video memory for the HVM domain, you need to avoid the need for ballooning, +by using the hypervisor dom0_mem= option for instance. + +Using with XL +------------- + +The enable IOEMU stub domains set the following in your domain +config: + + device_model_stubdomain_override = 1 + +See xl.cfg(5) for more details of the xl domain configuration syntax +and http://wiki.xen.org/wiki/Device_Model_Stub_Domains for more +information on device model stub domains + + + PV-GRUB + ======= + + This replaces pygrub to boot domU images safely: it runs the regular grub +inside the created domain itself and uses regular domU facilities to read the +disk / fetch files from network etc. ; it eventually loads the PV kernel and +chain-boots it. + +Configuration +============= + +In your PV config, + +- use pv-grub.gz as kernel: + +kernel = "pv-grub.gz" + +- set the path to menu.lst, as seen from the domU, in extra: + +extra = "(hd0,0)/boot/grub/menu.lst" + +or you can provide the content of a menu.lst stored in dom0 by passing it as a +ramdisk: + +ramdisk = "/boot/domU-1-menu.lst" + +or you can also use a tftp path (dhcp will be automatically performed): + +extra = "(nd)/somepath/menu.lst" + +or you can set it in option 150 of your dhcp server and leave extra and ramdisk +empty (dhcp will be automatically performed) + +Limitations +=========== + +- You can not boot a 64bit kernel with a 32bit-compiled PV-GRUB and vice-versa. +To cross-compile a 32bit PV-GRUB, + +export XEN_TARGET_ARCH=x86_32 + +- bootsplash is supported, but the ioemu backend does not yet support restart +for use by the booted kernel. + +- PV-GRUB doesn't support virtualized partitions. For instance: + +disk = [ 'phy:hda7,hda7,w' ] + +will be seen by PV-GRUB as (hd0), not (hd0,6), since GRUB will not see any +partition table. + + + Your own stubdom + ================ + + By running + +cd stubdom/ +make c-stubdom + + or + +cd stubdom/ +make caml-stubdom + + you can compile examples of C or caml stub domain kernels. You can use these +and the relevant Makefile rules as basis to build your own stub domain kernel. +Available libraries are libc, libxc, libxs, zlib and libpci. diff --git a/docs/misc/xenmon.txt b/docs/misc/xenmon.txt new file mode 100644 index 0000000..3393f5b --- /dev/null +++ b/docs/misc/xenmon.txt @@ -0,0 +1,114 @@ +Xen Performance Monitor +----------------------- + +The xenmon tools make use of the existing xen tracing feature to provide fine +grained reporting of various domain related metrics. It should be stressed that +the xenmon.py script included here is just an example of the data that may be +displayed. The xenbake demon keeps a large amount of history in a shared memory +area that may be accessed by tools such as xenmon. + +For each domain, xenmon reports various metrics. One part of the display is a +group of metrics that have been accumulated over the last second, while another +part of the display shows data measured over 10 seconds. Other measurement +intervals are possible, but we have just chosen 1s and 10s as an example. + + +Execution Count +--------------- + o The number of times that a domain was scheduled to run (ie, dispatched) over + the measurement interval + + +CPU usage +--------- + o Total time used over the measurement interval + o Usage expressed as a percentage of the measurement interval + o Average cpu time used during each execution of the domain + + +Waiting time +------------ +This is how much time the domain spent waiting to run, or put another way, the +amount of time the domain spent in the "runnable" state (or on the run queue) +but not actually running. Xenmon displays: + + o Total time waiting over the measurement interval + o Wait time expressed as a percentage of the measurement interval + o Average waiting time for each execution of the domain + +Blocked time +------------ +This is how much time the domain spent blocked (or sleeping); Put another way, +the amount of time the domain spent not needing/wanting the cpu because it was +waiting for some event (ie, I/O). Xenmon reports: + + o Total time blocked over the measurement interval + o Blocked time expressed as a percentage of the measurement interval + o Blocked time per I/O (see I/O count below) + +Allocation time +--------------- +This is how much cpu time was allocated to the domain by the scheduler; This is +distinct from cpu usage since the "time slice" given to a domain is frequently +cut short for one reason or another, ie, the domain requests I/O and blocks. +Xenmon reports: + + o Average allocation time per execution (ie, time slice) + o Min and Max allocation times + +I/O Count +--------- +This is a rough measure of I/O requested by the domain. The number of page +exchanges (or page "flips") between the domain and dom0 are counted. The +number of pages exchanged may not accurately reflect the number of bytes +transferred to/from a domain due to partial pages being used by the network +protocols, etc. But it does give a good sense of the magnitude of I/O being +requested by a domain. Xenmon reports: + + o Total number of page exchanges during the measurement interval + o Average number of page exchanges per execution of the domain + + +Usage Notes and issues +---------------------- + - Start xenmon by simply running xenmon.py; The xenbake demon is started and + stopped automatically by xenmon. + - To see the various options for xenmon, run xenmon -h. Ditto for xenbaked. + - xenmon also has an option (-n) to output log data to a file instead of the + curses interface. + - NDOMAINS is defined to be 32, but can be changed by recompiling xenbaked + - Xenmon.py appears to create 1-2% cpu overhead; Part of this is just the + overhead of the python interpreter. Part of it may be the number of trace + records being generated. The number of trace records generated can be + limited by setting the trace mask (with a dom0 Op), which controls which + events cause a trace record to be emitted. + - To exit xenmon, type 'q' + - To cycle the display to other physical cpu's, type 'c' + - The first time xenmon is run, it attempts to allocate xen trace buffers + using a default size. If you wish to use a non-default value for the + trace buffer size, run the 'setsize' program (located in tools/xentrace) + and specify the number of memory pages as a parameter. The default is 20. + - Not well tested with domains using more than 1 virtual cpu + - If you create a lot of domains, or repeatedly kill a domain and restart it, + and the domain id's get to be bigger than NDOMAINS, then xenmon behaves badly. + This is a bug that is due to xenbaked's treatment of domain id's vs. domain + indices in a data array. Will be fixed in a future release; Workaround: + Increase NDOMAINS in xenbaked and rebuild. + +Future Work +----------- +o RPC interface to allow external entities to programmatically access processed data +o I/O Count batching to reduce number of trace records generated + +Case Study +---------- +We have written a case study which demonstrates some of the usefulness of +this tool and the metrics reported. It is available at: +http://www.hpl.hp.com/techreports/2005/HPL-2005-187.html + +Authors +------- +Diwaker Gupta +Rob Gardner +Lucy Cherkasova + diff --git a/stubdom/Makefile b/stubdom/Makefile index faa7c21..e1359cf 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -463,15 +463,11 @@ xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxc xenstore ######### ifeq ($(STUBDOM_SUPPORTED),1) -install: $(STUBDOMPATH) install-readme $(STUBDOM_INSTALL) +install: $(STUBDOMPATH) $(STUBDOM_INSTALL) else install: $(STUBDOMPATH) endif -install-readme: - $(INSTALL_DIR) $(DESTDIR)$(docdir) - $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.stubdom - install-ioemu: ioemu-stubdom $(INSTALL_DIR) "$(DESTDIR)$(LIBEXEC_BIN)" $(INSTALL_PROG) stubdom-dm "$(DESTDIR)$(LIBEXEC_BIN)" diff --git a/stubdom/README b/stubdom/README deleted file mode 100644 index de7b6c7..0000000 --- a/stubdom/README +++ /dev/null @@ -1,93 +0,0 @@ - IOEMU stubdom - ============= - - This boosts HVM performance by putting ioemu in its own lightweight domain. - -General Configuration -===================== - -Due to a race between the creation of the IOEMU stubdomain itself and allocation -of video memory for the HVM domain, you need to avoid the need for ballooning, -by using the hypervisor dom0_mem= option for instance. - -Using with XL -------------- - -The enable IOEMU stub domains set the following in your domain -config: - - device_model_stubdomain_override = 1 - -See xl.cfg(5) for more details of the xl domain configuration syntax -and http://wiki.xen.org/wiki/Device_Model_Stub_Domains for more -information on device model stub domains - - - PV-GRUB - ======= - - This replaces pygrub to boot domU images safely: it runs the regular grub -inside the created domain itself and uses regular domU facilities to read the -disk / fetch files from network etc. ; it eventually loads the PV kernel and -chain-boots it. - -Configuration -============= - -In your PV config, - -- use pv-grub.gz as kernel: - -kernel = "pv-grub.gz" - -- set the path to menu.lst, as seen from the domU, in extra: - -extra = "(hd0,0)/boot/grub/menu.lst" - -or you can provide the content of a menu.lst stored in dom0 by passing it as a -ramdisk: - -ramdisk = "/boot/domU-1-menu.lst" - -or you can also use a tftp path (dhcp will be automatically performed): - -extra = "(nd)/somepath/menu.lst" - -or you can set it in option 150 of your dhcp server and leave extra and ramdisk -empty (dhcp will be automatically performed) - -Limitations -=========== - -- You can not boot a 64bit kernel with a 32bit-compiled PV-GRUB and vice-versa. -To cross-compile a 32bit PV-GRUB, - -export XEN_TARGET_ARCH=x86_32 - -- bootsplash is supported, but the ioemu backend does not yet support restart -for use by the booted kernel. - -- PV-GRUB doesn't support virtualized partitions. For instance: - -disk = [ 'phy:hda7,hda7,w' ] - -will be seen by PV-GRUB as (hd0), not (hd0,6), since GRUB will not see any -partition table. - - - Your own stubdom - ================ - - By running - -cd stubdom/ -make c-stubdom - - or - -cd stubdom/ -make caml-stubdom - - you can compile examples of C or caml stub domain kernels. You can use these -and the relevant Makefile rules as basis to build your own stub domain kernel. -Available libraries are libc, libxc, libxs, zlib and libpci. diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index 5095682..20ea100 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -31,8 +31,6 @@ install: build $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon.py - $(INSTALL_DIR) $(DESTDIR)$(docdir) - $(INSTALL_DATA) README $(DESTDIR)$(docdir)/README.xenmon .PHONY: clean clean: diff --git a/tools/xenmon/README b/tools/xenmon/README deleted file mode 100644 index 3393f5b..0000000 --- a/tools/xenmon/README +++ /dev/null @@ -1,114 +0,0 @@ -Xen Performance Monitor ------------------------ - -The xenmon tools make use of the existing xen tracing feature to provide fine -grained reporting of various domain related metrics. It should be stressed that -the xenmon.py script included here is just an example of the data that may be -displayed. The xenbake demon keeps a large amount of history in a shared memory -area that may be accessed by tools such as xenmon. - -For each domain, xenmon reports various metrics. One part of the display is a -group of metrics that have been accumulated over the last second, while another -part of the display shows data measured over 10 seconds. Other measurement -intervals are possible, but we have just chosen 1s and 10s as an example. - - -Execution Count ---------------- - o The number of times that a domain was scheduled to run (ie, dispatched) over - the measurement interval - - -CPU usage ---------- - o Total time used over the measurement interval - o Usage expressed as a percentage of the measurement interval - o Average cpu time used during each execution of the domain - - -Waiting time ------------- -This is how much time the domain spent waiting to run, or put another way, the -amount of time the domain spent in the "runnable" state (or on the run queue) -but not actually running. Xenmon displays: - - o Total time waiting over the measurement interval - o Wait time expressed as a percentage of the measurement interval - o Average waiting time for each execution of the domain - -Blocked time ------------- -This is how much time the domain spent blocked (or sleeping); Put another way, -the amount of time the domain spent not needing/wanting the cpu because it was -waiting for some event (ie, I/O). Xenmon reports: - - o Total time blocked over the measurement interval - o Blocked time expressed as a percentage of the measurement interval - o Blocked time per I/O (see I/O count below) - -Allocation time ---------------- -This is how much cpu time was allocated to the domain by the scheduler; This is -distinct from cpu usage since the "time slice" given to a domain is frequently -cut short for one reason or another, ie, the domain requests I/O and blocks. -Xenmon reports: - - o Average allocation time per execution (ie, time slice) - o Min and Max allocation times - -I/O Count ---------- -This is a rough measure of I/O requested by the domain. The number of page -exchanges (or page "flips") between the domain and dom0 are counted. The -number of pages exchanged may not accurately reflect the number of bytes -transferred to/from a domain due to partial pages being used by the network -protocols, etc. But it does give a good sense of the magnitude of I/O being -requested by a domain. Xenmon reports: - - o Total number of page exchanges during the measurement interval - o Average number of page exchanges per execution of the domain - - -Usage Notes and issues ----------------------- - - Start xenmon by simply running xenmon.py; The xenbake demon is started and - stopped automatically by xenmon. - - To see the various options for xenmon, run xenmon -h. Ditto for xenbaked. - - xenmon also has an option (-n) to output log data to a file instead of the - curses interface. - - NDOMAINS is defined to be 32, but can be changed by recompiling xenbaked - - Xenmon.py appears to create 1-2% cpu overhead; Part of this is just the - overhead of the python interpreter. Part of it may be the number of trace - records being generated. The number of trace records generated can be - limited by setting the trace mask (with a dom0 Op), which controls which - events cause a trace record to be emitted. - - To exit xenmon, type 'q' - - To cycle the display to other physical cpu's, type 'c' - - The first time xenmon is run, it attempts to allocate xen trace buffers - using a default size. If you wish to use a non-default value for the - trace buffer size, run the 'setsize' program (located in tools/xentrace) - and specify the number of memory pages as a parameter. The default is 20. - - Not well tested with domains using more than 1 virtual cpu - - If you create a lot of domains, or repeatedly kill a domain and restart it, - and the domain id's get to be bigger than NDOMAINS, then xenmon behaves badly. - This is a bug that is due to xenbaked's treatment of domain id's vs. domain - indices in a data array. Will be fixed in a future release; Workaround: - Increase NDOMAINS in xenbaked and rebuild. - -Future Work ------------ -o RPC interface to allow external entities to programmatically access processed data -o I/O Count batching to reduce number of trace records generated - -Case Study ----------- -We have written a case study which demonstrates some of the usefulness of -this tool and the metrics reported. It is available at: -http://www.hpl.hp.com/techreports/2005/HPL-2005-187.html - -Authors -------- -Diwaker Gupta -Rob Gardner -Lucy Cherkasova - -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10: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 1ZWjF2-0006hR-2B; Tue, 01 Sep 2015 10:56:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjF0-0006h3-Hj for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:38 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 8E/BA-19125-56485E55; Tue, 01 Sep 2015 10:56:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1441104995!31891678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12209 invoked from network); 1 Sep 2015 10:56:36 -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; 1 Sep 2015 10:56:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEx-00020O-PH for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEx-00051b-On for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:35 +0000 Date: Tue, 01 Sep 2015 10:56:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move xentop.1 to docs/man/xentop.pod.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 570de9c38419e0287479a819a80d691a0913e5e2 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:20 2015 +0100 docs: Move xentop.1 to docs/man/xentop.pod.1 And transform to POD to match our other manpages. The content is identical, although the layout differs slightly with certain indentation. In addition, adjust the MAN{1,5}SRC-y `find` runes to be more general. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/Makefile | 6 +-- docs/man/xentop.pod.1 | 111 +++++++++++++++++++++++++++++++++++++++++ tools/xenstat/xentop/Makefile | 4 +- tools/xenstat/xentop/xentop.1 | 103 -------------------------------------- 4 files changed, 114 insertions(+), 110 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 272292c..ef3340c 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,10 +7,8 @@ VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build -MAN1SRC-y += $(sort $(shell find man -name 'xl*.pod.1' -print)) -MAN1SRC-y += $(sort $(shell find man -name 'xenstore*.pod.1' -print)) - -MAN5SRC-y := $(sort $(shell find man -name 'xl*.pod.5' -print)) +MAN1SRC-y := $(sort $(shell find man/ -name '*.pod.1' -print)) +MAN5SRC-y := $(sort $(shell find man/ -name '*.pod.5' -print)) MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) diff --git a/docs/man/xentop.pod.1 b/docs/man/xentop.pod.1 new file mode 100644 index 0000000..1d0eb50 --- /dev/null +++ b/docs/man/xentop.pod.1 @@ -0,0 +1,111 @@ +=head1 NAME + +xentop - displays real-time information about a Xen system and domains + +=head1 SYNOPSIS + +B [B<-h>] [B<-V>] [B<-d>SECONDS] [B<-n>] [B<-r>] [B<-v>] [B<-f>] +[B<-b>] [B<-i>ITERATIONS] + +=head1 DESCRIPTION + +B displays information about the Xen system and domains, in a +continually-updating manner. Command-line options and interactive commands +can change the detail and format of the information displayed by B. + +=head1 OPTIONS + +=over 4 + +=item B<-h>, B<--help> + +display help and exit + +=item B<-V>, B<--version> + +output version information and exit + +=item B<-d>, B<--delay>=I + +seconds between updates (default 3) + +=item B<-n>, B<--networks> + +output network information + +=item B<-x>, B<--vbds> + +output vbd block device data + +=item B<-r>, B<--repeat-header> + +repeat table header before each domain + +=item B<-v>, B<--vcpus> + +output VCPU data + +=item B<-f>, B<--full-name> + +output the full domain name (not truncated) + +=item B<-b>, B<--batch> + +output data in batch mode (to stdout) + +=item B<-i>, B<--iterations>=I + +maximum number of iterations xentop should produce before ending + +=back + +=head1 INTERACTIVE COMMANDS + +All interactive commands are case-insensitive. + +=over 4 + +=item B + +set delay between updates + +=item B + +toggle display of network information + +=item B, B + +quit + +=item B + +toggle table header before each domain + +=item B + +cycle sort order + +=item B + +toggle display of VCPU information + +=item B + +scroll domain display + +=back + +=head1 AUTHORS + +Written by Judy Fischbach, David Hendricks, and Josh Triplett + +=head1 REPORTING BUGS + +Report bugs to . + +=head1 COPYRIGHT + +Copyright 2005 International Business Machines Corp + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index e67c9ab..1cc393f 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -30,11 +30,9 @@ LDFLAGS += $(APPEND_LDFLAGS) all: xentop .PHONY: install -install: xentop xentop.1 +install: xentop $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop - $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) - $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1 endif diff --git a/tools/xenstat/xentop/xentop.1 b/tools/xenstat/xentop/xentop.1 deleted file mode 100644 index 82c000e..0000000 --- a/tools/xenstat/xentop/xentop.1 +++ /dev/null @@ -1,103 +0,0 @@ -.\" Copyright (C) International Business Machines Corp., 2005 -.\" Author: Josh Triplett -.\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; under version 2 of the License. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this program; If not, see . -.TH xentop 1 "August 2005" -.SH NAME -\fBxentop\fR \- displays real-time information about a Xen system and domains - -.SH SYNOPSIS -.B xentop -[\fB\-h\fR] -[\fB\-V\fR] -[\fB\-d\fRSECONDS] -[\fB\-n\fR] -[\fB\-r\fR] -[\fB\-v\fR] -[\fB\-f\fR] -[\fB\-b\fR] -[\fB\-i\fRITERATIONS] - -.SH DESCRIPTION -\fBxentop\fR displays information about the Xen system and domains, in a -continually-updating manner. Command-line options and interactive commands -can change the detail and format of the information displayed by \fBxentop\fR. - -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -display help and exit -.TP -\fB\-V\fR, \fB\-\-version\fR -output version information and exit -.TP -\fB\-d\fR, \fB\-\-delay\fR=\fISECONDS\fR -seconds between updates (default 3) -.TP -\fB\-n\fR, \fB\-\-networks\fR -output network information -.TP -\fB\-x\fR, \fB\-\-vbds\fR -output vbd block device data -.TP -\fB\-r\fR, \fB\-\-repeat\-header\fR -repeat table header before each domain -.TP -\fB\-v\fR, \fB\-\-vcpus\fR -output VCPU data -.TP -\fB\-f\fR, \fB\-\-full\-name\fR -output the full domain name (not truncated) -.TP -\fB\-b\fR, \fB\-\-batch\fR -output data in batch mode (to stdout) -.TP -\fB\-i\fR, \fB\-\-iterations\fR=\fIITERATIONS\fR -maximum number of iterations xentop should produce before ending - - -.SH "INTERACTIVE COMMANDS" -All interactive commands are case-insensitive. -.TP -.B D -set delay between updates -.TP -.B N -toggle display of network information -.TP -.B Q, Esc -quit -.TP -.B R -toggle table header before each domain -.TP -.B S -cycle sort order -.TP -.B V -toggle display of VCPU information -.TP -.B Arrows -scroll domain display - -.SH AUTHORS -Written by Judy Fischbach, David Hendricks, and Josh Triplett - -.SH "REPORTING BUGS" -Report bugs to . - -.SH COPYRIGHT -Copyright \(co 2005 International Business Machines Corp -.br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10: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 1ZWjF2-0006hR-2B; Tue, 01 Sep 2015 10:56:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjF0-0006h3-Hj for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:38 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 8E/BA-19125-56485E55; Tue, 01 Sep 2015 10:56:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1441104995!31891678!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12209 invoked from network); 1 Sep 2015 10:56:36 -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; 1 Sep 2015 10:56:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjEx-00020O-PH for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjEx-00051b-On for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:35 +0000 Date: Tue, 01 Sep 2015 10:56:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move xentop.1 to docs/man/xentop.pod.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 570de9c38419e0287479a819a80d691a0913e5e2 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:20 2015 +0100 docs: Move xentop.1 to docs/man/xentop.pod.1 And transform to POD to match our other manpages. The content is identical, although the layout differs slightly with certain indentation. In addition, adjust the MAN{1,5}SRC-y `find` runes to be more general. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/Makefile | 6 +-- docs/man/xentop.pod.1 | 111 +++++++++++++++++++++++++++++++++++++++++ tools/xenstat/xentop/Makefile | 4 +- tools/xenstat/xentop/xentop.1 | 103 -------------------------------------- 4 files changed, 114 insertions(+), 110 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 272292c..ef3340c 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -7,10 +7,8 @@ VERSION := $(shell $(MAKE) -C $(XEN_ROOT)/xen --no-print-directory xenversion) DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build -MAN1SRC-y += $(sort $(shell find man -name 'xl*.pod.1' -print)) -MAN1SRC-y += $(sort $(shell find man -name 'xenstore*.pod.1' -print)) - -MAN5SRC-y := $(sort $(shell find man -name 'xl*.pod.5' -print)) +MAN1SRC-y := $(sort $(shell find man/ -name '*.pod.1' -print)) +MAN5SRC-y := $(sort $(shell find man/ -name '*.pod.5' -print)) MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) diff --git a/docs/man/xentop.pod.1 b/docs/man/xentop.pod.1 new file mode 100644 index 0000000..1d0eb50 --- /dev/null +++ b/docs/man/xentop.pod.1 @@ -0,0 +1,111 @@ +=head1 NAME + +xentop - displays real-time information about a Xen system and domains + +=head1 SYNOPSIS + +B [B<-h>] [B<-V>] [B<-d>SECONDS] [B<-n>] [B<-r>] [B<-v>] [B<-f>] +[B<-b>] [B<-i>ITERATIONS] + +=head1 DESCRIPTION + +B displays information about the Xen system and domains, in a +continually-updating manner. Command-line options and interactive commands +can change the detail and format of the information displayed by B. + +=head1 OPTIONS + +=over 4 + +=item B<-h>, B<--help> + +display help and exit + +=item B<-V>, B<--version> + +output version information and exit + +=item B<-d>, B<--delay>=I + +seconds between updates (default 3) + +=item B<-n>, B<--networks> + +output network information + +=item B<-x>, B<--vbds> + +output vbd block device data + +=item B<-r>, B<--repeat-header> + +repeat table header before each domain + +=item B<-v>, B<--vcpus> + +output VCPU data + +=item B<-f>, B<--full-name> + +output the full domain name (not truncated) + +=item B<-b>, B<--batch> + +output data in batch mode (to stdout) + +=item B<-i>, B<--iterations>=I + +maximum number of iterations xentop should produce before ending + +=back + +=head1 INTERACTIVE COMMANDS + +All interactive commands are case-insensitive. + +=over 4 + +=item B + +set delay between updates + +=item B + +toggle display of network information + +=item B, B + +quit + +=item B + +toggle table header before each domain + +=item B + +cycle sort order + +=item B + +toggle display of VCPU information + +=item B + +scroll domain display + +=back + +=head1 AUTHORS + +Written by Judy Fischbach, David Hendricks, and Josh Triplett + +=head1 REPORTING BUGS + +Report bugs to . + +=head1 COPYRIGHT + +Copyright 2005 International Business Machines Corp + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff --git a/tools/xenstat/xentop/Makefile b/tools/xenstat/xentop/Makefile index e67c9ab..1cc393f 100644 --- a/tools/xenstat/xentop/Makefile +++ b/tools/xenstat/xentop/Makefile @@ -30,11 +30,9 @@ LDFLAGS += $(APPEND_LDFLAGS) all: xentop .PHONY: install -install: xentop xentop.1 +install: xentop $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_PROG) xentop $(DESTDIR)$(sbindir)/xentop - $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) - $(INSTALL_DATA) xentop.1 $(DESTDIR)$(MAN1DIR)/xentop.1 endif diff --git a/tools/xenstat/xentop/xentop.1 b/tools/xenstat/xentop/xentop.1 deleted file mode 100644 index 82c000e..0000000 --- a/tools/xenstat/xentop/xentop.1 +++ /dev/null @@ -1,103 +0,0 @@ -.\" Copyright (C) International Business Machines Corp., 2005 -.\" Author: Josh Triplett -.\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; under version 2 of the License. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this program; If not, see . -.TH xentop 1 "August 2005" -.SH NAME -\fBxentop\fR \- displays real-time information about a Xen system and domains - -.SH SYNOPSIS -.B xentop -[\fB\-h\fR] -[\fB\-V\fR] -[\fB\-d\fRSECONDS] -[\fB\-n\fR] -[\fB\-r\fR] -[\fB\-v\fR] -[\fB\-f\fR] -[\fB\-b\fR] -[\fB\-i\fRITERATIONS] - -.SH DESCRIPTION -\fBxentop\fR displays information about the Xen system and domains, in a -continually-updating manner. Command-line options and interactive commands -can change the detail and format of the information displayed by \fBxentop\fR. - -.SH OPTIONS -.TP -\fB\-h\fR, \fB\-\-help\fR -display help and exit -.TP -\fB\-V\fR, \fB\-\-version\fR -output version information and exit -.TP -\fB\-d\fR, \fB\-\-delay\fR=\fISECONDS\fR -seconds between updates (default 3) -.TP -\fB\-n\fR, \fB\-\-networks\fR -output network information -.TP -\fB\-x\fR, \fB\-\-vbds\fR -output vbd block device data -.TP -\fB\-r\fR, \fB\-\-repeat\-header\fR -repeat table header before each domain -.TP -\fB\-v\fR, \fB\-\-vcpus\fR -output VCPU data -.TP -\fB\-f\fR, \fB\-\-full\-name\fR -output the full domain name (not truncated) -.TP -\fB\-b\fR, \fB\-\-batch\fR -output data in batch mode (to stdout) -.TP -\fB\-i\fR, \fB\-\-iterations\fR=\fIITERATIONS\fR -maximum number of iterations xentop should produce before ending - - -.SH "INTERACTIVE COMMANDS" -All interactive commands are case-insensitive. -.TP -.B D -set delay between updates -.TP -.B N -toggle display of network information -.TP -.B Q, Esc -quit -.TP -.B R -toggle table header before each domain -.TP -.B S -cycle sort order -.TP -.B V -toggle display of VCPU information -.TP -.B Arrows -scroll domain display - -.SH AUTHORS -Written by Judy Fischbach, David Hendricks, and Josh Triplett - -.SH "REPORTING BUGS" -Report bugs to . - -.SH COPYRIGHT -Copyright \(co 2005 International Business Machines Corp -.br -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFC-0006lG-GV; Tue, 01 Sep 2015 10:56:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFB-0006kp-BC for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:49 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id A3/E7-32615-07485E55; Tue, 01 Sep 2015 10:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441105006!31897671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5929 invoked from network); 1 Sep 2015 10:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjF8-00020Z-Ow for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjF7-00051x-Sy for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:45 +0000 Date: Tue, 01 Sep 2015 10:56:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move xentrace_format.1 to docs/man/xentrace_format.pod.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 014b165f9b9897dd0d0169f2d3aafb6c46436e60 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:12 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:27 2015 +0100 docs: Move xentrace_format.1 to docs/man/xentrace_format.pod.1 And transform to POD to match our other manpages. The content is identical (other than one correction), although the layout differs slightly with certain indentation. As a correction, remove the reference to xentrace_cpusplit(1) which was removed in c/s 9b9ca98b6ab16, more than 10 years ago! Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/man/xentrace_format.pod.1 | 46 ++++++++++++++++++++++++++++++++++++++ tools/xentrace/Makefile | 3 -- tools/xentrace/xentrace_format.1 | 44 ------------------------------------ 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/docs/man/xentrace_format.pod.1 b/docs/man/xentrace_format.pod.1 new file mode 100644 index 0000000..e05479a --- /dev/null +++ b/docs/man/xentrace_format.pod.1 @@ -0,0 +1,46 @@ +=head1 NAME + +xentrace_format - pretty-print Xen trace data + +=head1 SYNOPSIS + +B [ I ] + +=head1 DESCRIPTION + +B parses trace data in B binary format from +standard input and reformats it according to the rules in a file of +definitions (I), printing to standard output. + +The rules in I should have the format shown below: + +I I I + +Each rule should start on a new line. + +The format string may include format specifiers, such as: +%(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, %(5)d + +[ the `d' format specifier output in decimal, alternatively `x' + will output in hexadecimal and `o' will output in octal ] + +These correspond to the CPU number, event ID, timestamp counter and +the 5 data fields from the trace record. There should be one such +rule for each type of event to be pretty-printed (events which do not +have formatting rules are ignored). + +A sample format file for Xen's predefined trace events is available +in the file tools/xentrace/formats in the Xen source tree. + +Depending on your system and the rate at which trace data is produced, +this script may not be able to keep up with the output of +B if it is piped directly. In these circumstances you +should have B output to a file for processing off-line. + +=head1 AUTHOR + +Mark A. Williamson + +=head1 SEE ALSO + +xentrace(8) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 2f57bda..41caccb 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -11,7 +11,6 @@ BIN = $(BIN-y) SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format -MAN1 = $(wildcard *.1) MAN8 = $(wildcard *.8) .PHONY: all @@ -25,7 +24,6 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) ifneq ($(BIN),) $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) @@ -33,7 +31,6 @@ endif $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) .PHONY: clean diff --git a/tools/xentrace/xentrace_format.1 b/tools/xentrace/xentrace_format.1 deleted file mode 100644 index 374ec6d..0000000 --- a/tools/xentrace/xentrace_format.1 +++ /dev/null @@ -1,44 +0,0 @@ -.TH XENTRACE_FORMAT 1 "11 May 2004" "Xen domain 0 utils" -.SH NAME -xentrace_format \- pretty-print Xen trace data -.SH SYNOPSIS -.B xentrace_format -[ -.I DEFS-FILE -] -.SH DESCRIPTION -.B xentrace_format -parses trace data in \fBxentrace\fP binary format from standard input -and reformats it according to the rules in a file of definitions -(\fIDEFS-FILE\fP), printing to standard output. - -The rules in \fIDEFS-FILE\fP should have the format shown below: - -\fIevent_id\fP \fIwhitespace\fP \fIformat\fP - -Each rule should start on a new line. - -The format string may include format specifiers, such as: -%(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, %(5)d - -[ the `d' format specifier output in decimal, alternatively `x' - will output in hexadecimal and `o' will output in octal ] - -These correspond to the CPU number, event ID, timestamp counter and -the 5 data fields from the trace record. There should be one such -rule for each type of event to be pretty-printed (events which do not -have formatting rules are ignored). - -A sample format file for Xen's predefined trace events is available -in the file tools/xentrace/formats in the Xen source tree. - -Depending on your system and the rate at which trace data is produced, -this script may not be able to keep up with the output of -\fBxentrace\fP if it is piped directly. In these circumstances you -should have \fBxentrace\fP output to a file for processing off-line. - -.SH AUTHOR -Mark A. Williamson - -.SH "SEE ALSO" -xentrace(8), xentrace_cpusplit(1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:56:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:56:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFC-0006lG-GV; Tue, 01 Sep 2015 10:56:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFB-0006kp-BC for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:49 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id A3/E7-32615-07485E55; Tue, 01 Sep 2015 10:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441105006!31897671!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5929 invoked from network); 1 Sep 2015 10:56:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:56:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjF8-00020Z-Ow for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjF7-00051x-Sy for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:45 +0000 Date: Tue, 01 Sep 2015 10:56:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move xentrace_format.1 to docs/man/xentrace_format.pod.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 014b165f9b9897dd0d0169f2d3aafb6c46436e60 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:12 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:27 2015 +0100 docs: Move xentrace_format.1 to docs/man/xentrace_format.pod.1 And transform to POD to match our other manpages. The content is identical (other than one correction), although the layout differs slightly with certain indentation. As a correction, remove the reference to xentrace_cpusplit(1) which was removed in c/s 9b9ca98b6ab16, more than 10 years ago! Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/man/xentrace_format.pod.1 | 46 ++++++++++++++++++++++++++++++++++++++ tools/xentrace/Makefile | 3 -- tools/xentrace/xentrace_format.1 | 44 ------------------------------------ 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/docs/man/xentrace_format.pod.1 b/docs/man/xentrace_format.pod.1 new file mode 100644 index 0000000..e05479a --- /dev/null +++ b/docs/man/xentrace_format.pod.1 @@ -0,0 +1,46 @@ +=head1 NAME + +xentrace_format - pretty-print Xen trace data + +=head1 SYNOPSIS + +B [ I ] + +=head1 DESCRIPTION + +B parses trace data in B binary format from +standard input and reformats it according to the rules in a file of +definitions (I), printing to standard output. + +The rules in I should have the format shown below: + +I I I + +Each rule should start on a new line. + +The format string may include format specifiers, such as: +%(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, %(5)d + +[ the `d' format specifier output in decimal, alternatively `x' + will output in hexadecimal and `o' will output in octal ] + +These correspond to the CPU number, event ID, timestamp counter and +the 5 data fields from the trace record. There should be one such +rule for each type of event to be pretty-printed (events which do not +have formatting rules are ignored). + +A sample format file for Xen's predefined trace events is available +in the file tools/xentrace/formats in the Xen source tree. + +Depending on your system and the rate at which trace data is produced, +this script may not be able to keep up with the output of +B if it is piped directly. In these circumstances you +should have B output to a file for processing off-line. + +=head1 AUTHOR + +Mark A. Williamson + +=head1 SEE ALSO + +xentrace(8) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 2f57bda..41caccb 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -11,7 +11,6 @@ BIN = $(BIN-y) SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format -MAN1 = $(wildcard *.1) MAN8 = $(wildcard *.8) .PHONY: all @@ -25,7 +24,6 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DIR) $(DESTDIR)$(MAN1DIR) $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) ifneq ($(BIN),) $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) @@ -33,7 +31,6 @@ endif $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(MAN1DIR) $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) .PHONY: clean diff --git a/tools/xentrace/xentrace_format.1 b/tools/xentrace/xentrace_format.1 deleted file mode 100644 index 374ec6d..0000000 --- a/tools/xentrace/xentrace_format.1 +++ /dev/null @@ -1,44 +0,0 @@ -.TH XENTRACE_FORMAT 1 "11 May 2004" "Xen domain 0 utils" -.SH NAME -xentrace_format \- pretty-print Xen trace data -.SH SYNOPSIS -.B xentrace_format -[ -.I DEFS-FILE -] -.SH DESCRIPTION -.B xentrace_format -parses trace data in \fBxentrace\fP binary format from standard input -and reformats it according to the rules in a file of definitions -(\fIDEFS-FILE\fP), printing to standard output. - -The rules in \fIDEFS-FILE\fP should have the format shown below: - -\fIevent_id\fP \fIwhitespace\fP \fIformat\fP - -Each rule should start on a new line. - -The format string may include format specifiers, such as: -%(cpu)d, %(tsc)d, %(event)d, %(1)d, %(2)d, %(3)d, %(4)d, %(5)d - -[ the `d' format specifier output in decimal, alternatively `x' - will output in hexadecimal and `o' will output in octal ] - -These correspond to the CPU number, event ID, timestamp counter and -the 5 data fields from the trace record. There should be one such -rule for each type of event to be pretty-printed (events which do not -have formatting rules are ignored). - -A sample format file for Xen's predefined trace events is available -in the file tools/xentrace/formats in the Xen source tree. - -Depending on your system and the rate at which trace data is produced, -this script may not be able to keep up with the output of -\fBxentrace\fP if it is piped directly. In these circumstances you -should have \fBxentrace\fP output to a file for processing off-line. - -.SH AUTHOR -Mark A. Williamson - -.SH "SEE ALSO" -xentrace(8), xentrace_cpusplit(1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFM-0006p0-JN; Tue, 01 Sep 2015 10:57:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFL-0006oW-Hl for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:59 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 4D/49-22089-A7485E55; Tue, 01 Sep 2015 10:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1441105017!31883025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11948 invoked from network); 1 Sep 2015 10:56:57 -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; 1 Sep 2015 10:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFI-00020h-TD for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFI-00052Q-Sf for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:56 +0000 Date: Tue, 01 Sep 2015 10:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Support for generating man(8) pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4304367c40969cea034028b0fe5b0c28033e7e9 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:31 2015 +0100 docs: Support for generating man(8) pages The manpage rules are very repetative, because of the section number being present in the filenames. Instead of adding another set of 3 rules, switch to using a metarule to automate the repetative action. New rules for different manpage sections can be added simply by extending the $(foreach) Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- .gitignore | 1 + docs/Makefile | 91 ++++++++++++++++++++++++++------------------------------ 2 files changed, 43 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index dafa3c4..9ead7c4 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ dist/* docs/html/ docs/man1/ docs/man5/ +docs/man8/ docs/pdf/ docs/txt/ extras/mini-os diff --git a/docs/Makefile b/docs/Makefile index ef3340c..3d77913 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,6 +9,7 @@ DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build MAN1SRC-y := $(sort $(shell find man/ -name '*.pod.1' -print)) MAN5SRC-y := $(sort $(shell find man/ -name '*.pod.5' -print)) +MAN8SRC-y := $(sort $(shell find man/ -name '*.pod.8' -print)) MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) @@ -19,17 +20,20 @@ PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) DOC_MAN5 := $(patsubst man/%.pod.5,man5/%.5,$(MAN5SRC-y)) +DOC_MAN8 := $(patsubst man/%.pod.8,man8/%.8,$(MAN8SRC-y)) DOC_HTML := $(patsubst %.markdown,html/%.html,$(MARKDOWNSRC-y)) \ $(patsubst %.pandoc,html/%.html,$(PANDOCSRC-y)) \ $(patsubst man/%.pod.1,html/man/%.1.html,$(MAN1SRC-y)) \ $(patsubst man/%.pod.5,html/man/%.5.html,$(MAN5SRC-y)) \ + $(patsubst man/%.pod.8,html/man/%.8.html,$(MAN8SRC-y)) \ $(patsubst %.txt,html/%.txt,$(TXTSRC-y)) \ $(patsubst %,html/hypercall/%/index.html,$(DOC_ARCHES)) DOC_TXT := $(patsubst %.txt,txt/%.txt,$(TXTSRC-y)) \ $(patsubst %.markdown,txt/%.txt,$(MARKDOWNSRC-y)) \ $(patsubst %.pandoc,txt/%.txt,$(PANDOCSRC-y)) \ $(patsubst man/%.pod.1,txt/man/%.1.txt,$(MAN1SRC-y)) \ - $(patsubst man/%.pod.5,txt/man/%.5.txt,$(MAN5SRC-y)) + $(patsubst man/%.pod.5,txt/man/%.5.txt,$(MAN5SRC-y)) \ + $(patsubst man/%.pod.8,txt/man/%.8.txt,$(MAN8SRC-y)) DOC_PDF := $(patsubst %.markdown,pdf/%.pdf,$(MARKDOWNSRC-y)) \ $(patsubst %.pandoc,pdf/%.pdf,$(PANDOCSRC-y)) @@ -55,7 +59,7 @@ else endif .PHONY: man-pages -man-pages: $(DOC_MAN1) $(DOC_MAN5) +man-pages: $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN8) .PHONY: pdf pdf: $(DOC_PDF) @@ -75,6 +79,42 @@ distclean: clean autom4te.cache # Top level install targets + +# Metarules for generating manpages. Run with $(1) substitued for section +define GENERATE_MANPAGE_RULES + +# Real manpages +man$(1)/%.$(1): man/%.pod.$(1) Makefile +ifneq ($(POD2MAN),) + @$(INSTALL_DIR) $$(@D) + $(POD2MAN) --release=$(VERSION) --name=$$* -s $(1) -c "Xen" $$< $$@ +else + @echo "pod2man not installed; skipping $$@" +endif + +# HTML manpages +html/man/%.$(1).html: man/%.pod.$(1) Makefile +ifneq ($(POD2HTML),) + @$(INSTALL_DIR) $$(@D) + $(POD2HTML) --infile=$$< --outfile=$$@ +else + @echo "pod2html not installed; skipping $$@" +endif + +# Text manpages +txt/man/%.$(1).txt: man/%.pod.$(1) Makefile +ifneq ($(POD2TEXT),) + @$(INSTALL_DIR) $$(@D) + $(POD2TEXT) $$< $$@ +else + @echo "pod2text not installed; skipping $$@" +endif + +endef + +# Generate manpage rules for each section +$(foreach i,1 5 8,$(eval $(call GENERATE_MANPAGE_RULES,$(i)))) + .PHONY: install-man-pages install-man-pages: man-pages $(INSTALL_DIR) $(DESTDIR)$(mandir) @@ -90,22 +130,6 @@ install-html: html txt figs install: install-man-pages install-html # Individual file build targets -man1/%.1: man/%.pod.1 Makefile -ifneq ($(POD2MAN),) - @$(INSTALL_DIR) $(@D) - $(POD2MAN) --release=$(VERSION) --name=$* -s 1 -c "Xen" $< $@ -else - @echo "pod2man not installed; skipping $@" -endif - -man5/%.5: man/%.pod.5 Makefile -ifneq ($(POD2MAN),) - @$(INSTALL_DIR) $(@D) - $(POD2MAN) --release=$(VERSION) --name=$* -s 5 -c "Xen" $< $@ -else - @echo "pod2man not installed; skipping $@" -endif - html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX $(PERL) -w -- $(CURDIR)/gen-html-index -i INDEX html $(DOC_HTML) @@ -121,21 +145,6 @@ html/%.txt: %.txt @$(INSTALL_DIR) $(@D) $(INSTALL_DATA) $< $@ -html/man/%.1.html: man/%.pod.1 Makefile -ifneq ($(POD2HTML),) - @$(INSTALL_DIR) $(@D) - $(POD2HTML) --infile=$< --outfile=$@ -else - @echo "pod2html not installed; skipping $@" -endif - -html/man/%.5.html: man/%.pod.5 Makefile -ifneq ($(POD2HTML),) - @$(INSTALL_DIR) $(@D) - $(POD2HTML) --infile=$< --outfile=$@ -else - @echo "pod2html not installed; skipping $@" -endif # For non-x86 arches exclude the subarch whole x86 arch. $(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall/$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 @@ -160,22 +169,6 @@ txt/%.txt: %.markdown @$(INSTALL_DIR) $(@D) $(INSTALL_DATA) $< $@ -txt/man/%.1.txt: man/%.pod.1 Makefile -ifneq ($(POD2TEXT),) - @$(INSTALL_DIR) $(@D) - $(POD2TEXT) $< $@ -else - @echo "pod2text not installed; skipping $@" -endif - -txt/man/%.5.txt: man/%.pod.5 Makefile -ifneq ($(POD2TEXT),) - @$(INSTALL_DIR) $(@D) - $(POD2TEXT) $< $@ -else - @echo "pod2text not installed; skipping $@" -endif - pdf/%.pdf: %.markdown ifneq ($(PANDOC),) @$(INSTALL_DIR) $(@D) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFM-0006p0-JN; Tue, 01 Sep 2015 10:57:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFL-0006oW-Hl for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:59 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 4D/49-22089-A7485E55; Tue, 01 Sep 2015 10:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1441105017!31883025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11948 invoked from network); 1 Sep 2015 10:56:57 -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; 1 Sep 2015 10:56:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFI-00020h-TD for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFI-00052Q-Sf for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:56:56 +0000 Date: Tue, 01 Sep 2015 10:56:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Support for generating man(8) pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4304367c40969cea034028b0fe5b0c28033e7e9 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:31 2015 +0100 docs: Support for generating man(8) pages The manpage rules are very repetative, because of the section number being present in the filenames. Instead of adding another set of 3 rules, switch to using a metarule to automate the repetative action. New rules for different manpage sections can be added simply by extending the $(foreach) Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- .gitignore | 1 + docs/Makefile | 91 ++++++++++++++++++++++++++------------------------------ 2 files changed, 43 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index dafa3c4..9ead7c4 100644 --- a/.gitignore +++ b/.gitignore @@ -43,6 +43,7 @@ dist/* docs/html/ docs/man1/ docs/man5/ +docs/man8/ docs/pdf/ docs/txt/ extras/mini-os diff --git a/docs/Makefile b/docs/Makefile index ef3340c..3d77913 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -9,6 +9,7 @@ DOC_ARCHES := arm x86_32 x86_64 # Documentation sources to build MAN1SRC-y := $(sort $(shell find man/ -name '*.pod.1' -print)) MAN5SRC-y := $(sort $(shell find man/ -name '*.pod.5' -print)) +MAN8SRC-y := $(sort $(shell find man/ -name '*.pod.8' -print)) MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) @@ -19,17 +20,20 @@ PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) DOC_MAN5 := $(patsubst man/%.pod.5,man5/%.5,$(MAN5SRC-y)) +DOC_MAN8 := $(patsubst man/%.pod.8,man8/%.8,$(MAN8SRC-y)) DOC_HTML := $(patsubst %.markdown,html/%.html,$(MARKDOWNSRC-y)) \ $(patsubst %.pandoc,html/%.html,$(PANDOCSRC-y)) \ $(patsubst man/%.pod.1,html/man/%.1.html,$(MAN1SRC-y)) \ $(patsubst man/%.pod.5,html/man/%.5.html,$(MAN5SRC-y)) \ + $(patsubst man/%.pod.8,html/man/%.8.html,$(MAN8SRC-y)) \ $(patsubst %.txt,html/%.txt,$(TXTSRC-y)) \ $(patsubst %,html/hypercall/%/index.html,$(DOC_ARCHES)) DOC_TXT := $(patsubst %.txt,txt/%.txt,$(TXTSRC-y)) \ $(patsubst %.markdown,txt/%.txt,$(MARKDOWNSRC-y)) \ $(patsubst %.pandoc,txt/%.txt,$(PANDOCSRC-y)) \ $(patsubst man/%.pod.1,txt/man/%.1.txt,$(MAN1SRC-y)) \ - $(patsubst man/%.pod.5,txt/man/%.5.txt,$(MAN5SRC-y)) + $(patsubst man/%.pod.5,txt/man/%.5.txt,$(MAN5SRC-y)) \ + $(patsubst man/%.pod.8,txt/man/%.8.txt,$(MAN8SRC-y)) DOC_PDF := $(patsubst %.markdown,pdf/%.pdf,$(MARKDOWNSRC-y)) \ $(patsubst %.pandoc,pdf/%.pdf,$(PANDOCSRC-y)) @@ -55,7 +59,7 @@ else endif .PHONY: man-pages -man-pages: $(DOC_MAN1) $(DOC_MAN5) +man-pages: $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN8) .PHONY: pdf pdf: $(DOC_PDF) @@ -75,6 +79,42 @@ distclean: clean autom4te.cache # Top level install targets + +# Metarules for generating manpages. Run with $(1) substitued for section +define GENERATE_MANPAGE_RULES + +# Real manpages +man$(1)/%.$(1): man/%.pod.$(1) Makefile +ifneq ($(POD2MAN),) + @$(INSTALL_DIR) $$(@D) + $(POD2MAN) --release=$(VERSION) --name=$$* -s $(1) -c "Xen" $$< $$@ +else + @echo "pod2man not installed; skipping $$@" +endif + +# HTML manpages +html/man/%.$(1).html: man/%.pod.$(1) Makefile +ifneq ($(POD2HTML),) + @$(INSTALL_DIR) $$(@D) + $(POD2HTML) --infile=$$< --outfile=$$@ +else + @echo "pod2html not installed; skipping $$@" +endif + +# Text manpages +txt/man/%.$(1).txt: man/%.pod.$(1) Makefile +ifneq ($(POD2TEXT),) + @$(INSTALL_DIR) $$(@D) + $(POD2TEXT) $$< $$@ +else + @echo "pod2text not installed; skipping $$@" +endif + +endef + +# Generate manpage rules for each section +$(foreach i,1 5 8,$(eval $(call GENERATE_MANPAGE_RULES,$(i)))) + .PHONY: install-man-pages install-man-pages: man-pages $(INSTALL_DIR) $(DESTDIR)$(mandir) @@ -90,22 +130,6 @@ install-html: html txt figs install: install-man-pages install-html # Individual file build targets -man1/%.1: man/%.pod.1 Makefile -ifneq ($(POD2MAN),) - @$(INSTALL_DIR) $(@D) - $(POD2MAN) --release=$(VERSION) --name=$* -s 1 -c "Xen" $< $@ -else - @echo "pod2man not installed; skipping $@" -endif - -man5/%.5: man/%.pod.5 Makefile -ifneq ($(POD2MAN),) - @$(INSTALL_DIR) $(@D) - $(POD2MAN) --release=$(VERSION) --name=$* -s 5 -c "Xen" $< $@ -else - @echo "pod2man not installed; skipping $@" -endif - html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX $(PERL) -w -- $(CURDIR)/gen-html-index -i INDEX html $(DOC_HTML) @@ -121,21 +145,6 @@ html/%.txt: %.txt @$(INSTALL_DIR) $(@D) $(INSTALL_DATA) $< $@ -html/man/%.1.html: man/%.pod.1 Makefile -ifneq ($(POD2HTML),) - @$(INSTALL_DIR) $(@D) - $(POD2HTML) --infile=$< --outfile=$@ -else - @echo "pod2html not installed; skipping $@" -endif - -html/man/%.5.html: man/%.pod.5 Makefile -ifneq ($(POD2HTML),) - @$(INSTALL_DIR) $(@D) - $(POD2HTML) --infile=$< --outfile=$@ -else - @echo "pod2html not installed; skipping $@" -endif # For non-x86 arches exclude the subarch whole x86 arch. $(foreach i,$(filter-out x86_32 x86_64,$(DOC_ARCHES)),html/hypercall/$(i)/index.html): EXTRA_EXCLUDE := -X arch-x86 @@ -160,22 +169,6 @@ txt/%.txt: %.markdown @$(INSTALL_DIR) $(@D) $(INSTALL_DATA) $< $@ -txt/man/%.1.txt: man/%.pod.1 Makefile -ifneq ($(POD2TEXT),) - @$(INSTALL_DIR) $(@D) - $(POD2TEXT) $< $@ -else - @echo "pod2text not installed; skipping $@" -endif - -txt/man/%.5.txt: man/%.pod.5 Makefile -ifneq ($(POD2TEXT),) - @$(INSTALL_DIR) $(@D) - $(POD2TEXT) $< $@ -else - @echo "pod2text not installed; skipping $@" -endif - pdf/%.pdf: %.markdown ifneq ($(PANDOC),) @$(INSTALL_DIR) $(@D) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57: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 1ZWjFX-00071m-MS; Tue, 01 Sep 2015 10:57:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFW-00071Q-Au for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:10 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id A9/E7-24856-58485E55; Tue, 01 Sep 2015 10:57:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1441105027!31878481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50, WEIRD_QUOTING X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27577 invoked from network); 1 Sep 2015 10:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFT-00021H-1u for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFT-00053g-0b for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:07 +0000 Date: Tue, 01 Sep 2015 10:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move xentrace.8 to docs/man/xentrace.pod.8 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b21214a3a8d8427bb1242f1cb5f138154ff5600 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:35 2015 +0100 docs: Move xentrace.8 to docs/man/xentrace.pod.8 And transform to POD to match our other manpages. The content is identical, although the formatting was altered slightly to conform to more usual manpage layout. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/man/xentrace.pod.8 | 166 +++++++++++++++++++++++++++++++++++++++++++++ tools/xentrace/Makefile | 3 - tools/xentrace/xentrace.8 | 164 -------------------------------------------- 3 files changed, 166 insertions(+), 167 deletions(-) diff --git a/docs/man/xentrace.pod.8 b/docs/man/xentrace.pod.8 new file mode 100644 index 0000000..69aef05 --- /dev/null +++ b/docs/man/xentrace.pod.8 @@ -0,0 +1,166 @@ +=head1 NAME + +xentrace - capture Xen trace buffer data + +=head1 SYNOPSIS + +B [ I ] [ I ] + +=head1 DESCRIPTION + +B is used to capture trace buffer data from Xen. The data is +output in the following binary format (host endian): + + CPU(uint) TSC(u64) EVENT(u32) D1 D2 D3 D4 D5 (all u32) + +Where CPU is the processor number, TSC is the record's timestamp +(the value of the CPU cycle counter), EVENT is the event ID and +D1...D5 are the trace data. + +Data is dumped onto the standard output (which must not be a TTY) or a +I specified on the command line. + +The output should be parsed using the tool xentrace_format, which can +produce human-readable output in ASCII format. + + +=head1 OPTIONS + +=over 4 + +=item B<-t> I, B<--log-thresh>=I + +set the threshold number, I, of new records required to trigger a write of +all new records to the output + +=item B<-s> I

, B<--poll-sleep>=I

+ +set the time, I

, (in milliseconds) to sleep between polling the buffers +for new data. + +=item B<-c> [I|I|I], B<--cpu-mask>=[I|I|I] + +This can be: a hex value (of the form 0xNNNN...), or a set of cpu +ranges as described below, or the string I. Hex values are limited +to 32 bits. If not specified, the cpu-mask as set during bootup will be +constructed. If using the I it expects decimal numbers, which +may be specified as follows: + + "0-3" + Trace only on CPUs 0 through 3 + + "0,2,5-7" + Trace only on CPUs 0, 2, and 5 through 7 + + "-3" + Trace only on CPUs 0 through 3 + + "-3,7" + Trace only on CPUs 0 through 3 and 7 + + "3-" + Trace only on CPUs 3 up to maximum numbers of CPUs the host has + +If using I it will use all of the CPUs the host has. + +=item B<-e> I, B<--evt-mask>=I + +set event capture mask. If not specified the TRC_ALL will be used. + +=item B<-?>, B<--help> + +Give this help list + +=item B<--usage> + +Give a short usage message + +=item B<-V>, B<--version> + +Print program version + +=back + +=head2 Event Classes (Masks) + +The following event classes (masks) can be used to filter the events being +gathered by xentrace: + + ID Description + + 0x0001f000 TRC_GEN + 0x0002f000 TRC_SCHED + 0x0004f000 TRC_DOM0OP + 0x0008f000 TRC_HVM + 0x0010f000 TRC_MEM + 0xfffff000 TRC_ALL + + +=head2 Event Subclasses (More Masks) + +The following event subclasses (masks) can also be used to filter the events being +gathered by xentrace: + + ID Description + + 0x00081000 TRC_HVM_ENTRYEXIT + 0x00082000 TRC_HVM_HANDLER + + +=head2 Events + +B collects the following events from the trace buffer: + + ID Description + + 0x0001f001 TRC_LOST_RECORDS + 0x0002f001 TRC_SCHED_DOM_ADD + 0x0002f002 TRC_SCHED_DOM_REM + 0x0002f003 TRC_SCHED_SLEEP + 0x0002f004 TRC_SCHED_WAKE + 0x0002f005 TRC_SCHED_YIELD + 0x0002f006 TRC_SCHED_BLOCK + 0x0002f007 TRC_SCHED_SHUTDOWN + 0x0002f008 TRC_SCHED_CTL + 0x0002f009 TRC_SCHED_ADJDOM + 0x0002f010 TRC_SCHED_SWITCH + 0x0002f011 TRC_SCHED_S_TIMER_FN + 0x0002f012 TRC_SCHED_T_TIMER_FN + 0x0002f013 TRC_SCHED_DOM_TIMER_FN + 0x0002f014 TRC_SCHED_SWITCH_INFPREV + 0x0002f015 TRC_SCHED_SWITCH_INFNEXT + + 0x00081001 TRC_HVM_VMENTRY + 0x00081002 TRC_HVM_VMEXIT + 0x00082001 TRC_HVM_PF_XEN + 0x00082002 TRC_HVM_PF_INJECT + 0x00082003 TRC_HVM_INJ_EXC + 0x00082004 TRC_HVM_INJ_VIRQ + 0x00082005 TRC_HVM_REINJ_VIRQ + 0x00082006 TRC_HVM_IO_READ + 0x00082007 TRC_HVM_IO_WRITE + 0x00082008 TRC_HVM_CR_READ + 0x00082009 TRC_HVM_CR_WRITE + 0x0008200A TRC_HVM_DR_READ + 0x0008200B TRC_HVM_DR_WRITE + 0x0008200C TRC_HVM_MSR_READ + 0x0008200D TRC_HVM_MSR_WRITE + 0x0008200E TRC_HVM_CPUID + 0x0008200F TRC_HVM_INTR + 0x00082010 TRC_HVM_NMI + 0x00082011 TRC_HVM_SMI + 0x00082012 TRC_HVM_VMMCALL + 0x00082013 TRC_HVM_HLT + 0x00082014 TRC_HVM_INVLPG + + 0x0010f001 TRC_MEM_PAGE_GRANT_MAP + 0x0010f002 TRC_MEM_PAGE_GRANT_UNMAP + 0x0010f003 TRC_MEM_PAGE_GRANT_TRANSFER + +=head1 AUTHOR + +Mark A. Williamson + +=head1 SEE ALSO + +xentrace_format(1) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 41caccb..6c13cd1 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -11,7 +11,6 @@ BIN = $(BIN-y) SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format -MAN8 = $(wildcard *.8) .PHONY: all all: build @@ -24,14 +23,12 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) ifneq ($(BIN),) $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) endif $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) .PHONY: clean clean: diff --git a/tools/xentrace/xentrace.8 b/tools/xentrace/xentrace.8 deleted file mode 100644 index 7b3172b..0000000 --- a/tools/xentrace/xentrace.8 +++ /dev/null @@ -1,164 +0,0 @@ -.TH XENTRACE 8 "22 February 2007" "Xen domain 0 utils" -.SH NAME -xentrace \- capture Xen trace buffer data -.SH SYNOPSIS -.B xentrace -[ -.I OPTIONS -] [ -.I FILE -] -.SH DESCRIPTION -.B xentrace -is used to capture trace buffer data from Xen. The data is -output in the following binary format (host endian): -.PP - CPU(uint) TSC(u64) EVENT(u32) D1 D2 D3 D4 D5 (all u32) -.PP -Where CPU is the processor number, TSC is the record's timestamp -(the value of the CPU cycle counter), EVENT is the event ID and -D1...D5 are the trace data. - -Data is dumped onto the standard output (which must not be a TTY) or a -\fIFILE\fP specified on the command line. - -The output should be parsed using the tool xentrace_format, which can -produce human-readable output in ASCII format. - - -.SS Options -.TP -.B -t, --log-thresh=l -set the threshold number, l, of new records required to trigger a write of -all new records to the output -.TP -.B -s, --poll-sleep=p -set the time, p, (in milliseconds) to sleep between polling the buffers -for new data. -.TP -.B -c, --cpu-mask=[\fIc\fP|\fICPU-LIST\fP|\fIall\fP] -This can be: a hex value (of the form 0xNNNN...), or a set of cpu -ranges as described below, or the string \fIall\fP. Hex values are limited -to 32 bits. If not specified, the cpu-mask as set during bootup will be -constructed. If using the \fICPU-LIST\fP it expects decimal numbers, which -may be specified as follows: - -.RS 4 -.ie n .IP """0-3""" 4 -.el .IP "``0-3''" 4 -.IX Item "0-3" -Trace only on CPUs 0 through 3 -.ie n .IP """0,2,5-7""" 4 -.el .IP "``0,2,5-7''" 4 -.IX Item "0,2,5-7" -Trace only on CPUs 0, 2, and 5 through 7. -.ie n .IP """-3""" 4 -.el .IP "``-3''" 4 -.IX Item "-3" -Trace only on CPUs 0 through 3 -.ie n .IP """-3,7""" 4 -.el .IP "``-3,7''" 4 -.IX Item "-3,7" -Trace only on CPUs 0 through 3 and 7 -.ie n .IP """3-""" 4 -.el .IP "``3-''" 4 -.IX Item "-3-" -Trace only on CPUs 3 up to maximum numbers of CPUs the host has. -.RE -.Sp - -If using \fIall\fP it will use all of the CPUs the host has. -.TP -.B -e, --evt-mask=e -set event capture mask. If not specified the TRC_ALL will be used. -.TP -.B -?, --help -Give this help list -.TP -.B --usage -Give a short usage message -.TP -.B -V, --version -Print program version - -.SS Event Classes (Masks) -The following event classes (masks) can be used to filter the events being -gathered by xentrace: -.PP - \fIID\fP \fIDescription\fP -.PP - 0x0001f000 TRC_GEN - 0x0002f000 TRC_SCHED - 0x0004f000 TRC_DOM0OP - 0x0008f000 TRC_HVM - 0x0010f000 TRC_MEM - 0xfffff000 TRC_ALL - - -.SS Event Subclasses (More Masks) -The following event subclasses (masks) can also be used to filter the events being -gathered by xentrace: -.PP - \fIID\fP \fIDescription\fP -.PP - 0x00081000 TRC_HVM_ENTRYEXIT - 0x00082000 TRC_HVM_HANDLER - - -.SS Events -.B xentrace -collects the following events from the trace buffer: -.PP - \fIID\fP \fIDescription\fP -.PP - 0x0001f001 TRC_LOST_RECORDS - 0x0002f001 TRC_SCHED_DOM_ADD - 0x0002f002 TRC_SCHED_DOM_REM - 0x0002f003 TRC_SCHED_SLEEP - 0x0002f004 TRC_SCHED_WAKE - 0x0002f005 TRC_SCHED_YIELD - 0x0002f006 TRC_SCHED_BLOCK - 0x0002f007 TRC_SCHED_SHUTDOWN - 0x0002f008 TRC_SCHED_CTL - 0x0002f009 TRC_SCHED_ADJDOM - 0x0002f010 TRC_SCHED_SWITCH - 0x0002f011 TRC_SCHED_S_TIMER_FN - 0x0002f012 TRC_SCHED_T_TIMER_FN - 0x0002f013 TRC_SCHED_DOM_TIMER_FN - 0x0002f014 TRC_SCHED_SWITCH_INFPREV - 0x0002f015 TRC_SCHED_SWITCH_INFNEXT - - 0x00081001 TRC_HVM_VMENTRY - 0x00081002 TRC_HVM_VMEXIT - 0x00082001 TRC_HVM_PF_XEN - 0x00082002 TRC_HVM_PF_INJECT - 0x00082003 TRC_HVM_INJ_EXC - 0x00082004 TRC_HVM_INJ_VIRQ - 0x00082005 TRC_HVM_REINJ_VIRQ - 0x00082006 TRC_HVM_IO_READ - 0x00082007 TRC_HVM_IO_WRITE - 0x00082008 TRC_HVM_CR_READ - 0x00082009 TRC_HVM_CR_WRITE - 0x0008200A TRC_HVM_DR_READ - 0x0008200B TRC_HVM_DR_WRITE - 0x0008200C TRC_HVM_MSR_READ - 0x0008200D TRC_HVM_MSR_WRITE - 0x0008200E TRC_HVM_CPUID - 0x0008200F TRC_HVM_INTR - 0x00082010 TRC_HVM_NMI - 0x00082011 TRC_HVM_SMI - 0x00082012 TRC_HVM_VMMCALL - 0x00082013 TRC_HVM_HLT - 0x00082014 TRC_HVM_INVLPG - - 0x0010f001 TRC_MEM_PAGE_GRANT_MAP - 0x0010f002 TRC_MEM_PAGE_GRANT_UNMAP - 0x0010f003 TRC_MEM_PAGE_GRANT_TRANSFER - -.PP - -.SH AUTHOR -Mark A. Williamson - -.SH "SEE ALSO" -xentrace_format(1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57: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 1ZWjFX-00071m-MS; Tue, 01 Sep 2015 10:57:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFW-00071Q-Au for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:10 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id A9/E7-24856-58485E55; Tue, 01 Sep 2015 10:57:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1441105027!31878481!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50, WEIRD_QUOTING X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27577 invoked from network); 1 Sep 2015 10:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFT-00021H-1u for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFT-00053g-0b for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:07 +0000 Date: Tue, 01 Sep 2015 10:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Move xentrace.8 to docs/man/xentrace.pod.8 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b21214a3a8d8427bb1242f1cb5f138154ff5600 Author: Andrew Cooper AuthorDate: Wed Aug 26 09:15:20 2015 +0000 Commit: Ian Jackson CommitDate: Thu Aug 27 19:14:35 2015 +0100 docs: Move xentrace.8 to docs/man/xentrace.pod.8 And transform to POD to match our other manpages. The content is identical, although the formatting was altered slightly to conform to more usual manpage layout. Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- docs/man/xentrace.pod.8 | 166 +++++++++++++++++++++++++++++++++++++++++++++ tools/xentrace/Makefile | 3 - tools/xentrace/xentrace.8 | 164 -------------------------------------------- 3 files changed, 166 insertions(+), 167 deletions(-) diff --git a/docs/man/xentrace.pod.8 b/docs/man/xentrace.pod.8 new file mode 100644 index 0000000..69aef05 --- /dev/null +++ b/docs/man/xentrace.pod.8 @@ -0,0 +1,166 @@ +=head1 NAME + +xentrace - capture Xen trace buffer data + +=head1 SYNOPSIS + +B [ I ] [ I ] + +=head1 DESCRIPTION + +B is used to capture trace buffer data from Xen. The data is +output in the following binary format (host endian): + + CPU(uint) TSC(u64) EVENT(u32) D1 D2 D3 D4 D5 (all u32) + +Where CPU is the processor number, TSC is the record's timestamp +(the value of the CPU cycle counter), EVENT is the event ID and +D1...D5 are the trace data. + +Data is dumped onto the standard output (which must not be a TTY) or a +I specified on the command line. + +The output should be parsed using the tool xentrace_format, which can +produce human-readable output in ASCII format. + + +=head1 OPTIONS + +=over 4 + +=item B<-t> I, B<--log-thresh>=I + +set the threshold number, I, of new records required to trigger a write of +all new records to the output + +=item B<-s> I

, B<--poll-sleep>=I

+ +set the time, I

, (in milliseconds) to sleep between polling the buffers +for new data. + +=item B<-c> [I|I|I], B<--cpu-mask>=[I|I|I] + +This can be: a hex value (of the form 0xNNNN...), or a set of cpu +ranges as described below, or the string I. Hex values are limited +to 32 bits. If not specified, the cpu-mask as set during bootup will be +constructed. If using the I it expects decimal numbers, which +may be specified as follows: + + "0-3" + Trace only on CPUs 0 through 3 + + "0,2,5-7" + Trace only on CPUs 0, 2, and 5 through 7 + + "-3" + Trace only on CPUs 0 through 3 + + "-3,7" + Trace only on CPUs 0 through 3 and 7 + + "3-" + Trace only on CPUs 3 up to maximum numbers of CPUs the host has + +If using I it will use all of the CPUs the host has. + +=item B<-e> I, B<--evt-mask>=I + +set event capture mask. If not specified the TRC_ALL will be used. + +=item B<-?>, B<--help> + +Give this help list + +=item B<--usage> + +Give a short usage message + +=item B<-V>, B<--version> + +Print program version + +=back + +=head2 Event Classes (Masks) + +The following event classes (masks) can be used to filter the events being +gathered by xentrace: + + ID Description + + 0x0001f000 TRC_GEN + 0x0002f000 TRC_SCHED + 0x0004f000 TRC_DOM0OP + 0x0008f000 TRC_HVM + 0x0010f000 TRC_MEM + 0xfffff000 TRC_ALL + + +=head2 Event Subclasses (More Masks) + +The following event subclasses (masks) can also be used to filter the events being +gathered by xentrace: + + ID Description + + 0x00081000 TRC_HVM_ENTRYEXIT + 0x00082000 TRC_HVM_HANDLER + + +=head2 Events + +B collects the following events from the trace buffer: + + ID Description + + 0x0001f001 TRC_LOST_RECORDS + 0x0002f001 TRC_SCHED_DOM_ADD + 0x0002f002 TRC_SCHED_DOM_REM + 0x0002f003 TRC_SCHED_SLEEP + 0x0002f004 TRC_SCHED_WAKE + 0x0002f005 TRC_SCHED_YIELD + 0x0002f006 TRC_SCHED_BLOCK + 0x0002f007 TRC_SCHED_SHUTDOWN + 0x0002f008 TRC_SCHED_CTL + 0x0002f009 TRC_SCHED_ADJDOM + 0x0002f010 TRC_SCHED_SWITCH + 0x0002f011 TRC_SCHED_S_TIMER_FN + 0x0002f012 TRC_SCHED_T_TIMER_FN + 0x0002f013 TRC_SCHED_DOM_TIMER_FN + 0x0002f014 TRC_SCHED_SWITCH_INFPREV + 0x0002f015 TRC_SCHED_SWITCH_INFNEXT + + 0x00081001 TRC_HVM_VMENTRY + 0x00081002 TRC_HVM_VMEXIT + 0x00082001 TRC_HVM_PF_XEN + 0x00082002 TRC_HVM_PF_INJECT + 0x00082003 TRC_HVM_INJ_EXC + 0x00082004 TRC_HVM_INJ_VIRQ + 0x00082005 TRC_HVM_REINJ_VIRQ + 0x00082006 TRC_HVM_IO_READ + 0x00082007 TRC_HVM_IO_WRITE + 0x00082008 TRC_HVM_CR_READ + 0x00082009 TRC_HVM_CR_WRITE + 0x0008200A TRC_HVM_DR_READ + 0x0008200B TRC_HVM_DR_WRITE + 0x0008200C TRC_HVM_MSR_READ + 0x0008200D TRC_HVM_MSR_WRITE + 0x0008200E TRC_HVM_CPUID + 0x0008200F TRC_HVM_INTR + 0x00082010 TRC_HVM_NMI + 0x00082011 TRC_HVM_SMI + 0x00082012 TRC_HVM_VMMCALL + 0x00082013 TRC_HVM_HLT + 0x00082014 TRC_HVM_INVLPG + + 0x0010f001 TRC_MEM_PAGE_GRANT_MAP + 0x0010f002 TRC_MEM_PAGE_GRANT_UNMAP + 0x0010f003 TRC_MEM_PAGE_GRANT_TRANSFER + +=head1 AUTHOR + +Mark A. Williamson + +=head1 SEE ALSO + +xentrace_format(1) diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 41caccb..6c13cd1 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -11,7 +11,6 @@ BIN = $(BIN-y) SBIN = xentrace xentrace_setsize LIBBIN = xenctx SCRIPTS = xentrace_format -MAN8 = $(wildcard *.8) .PHONY: all all: build @@ -24,14 +23,12 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(sbindir) [ -z "$(LIBBIN)" ] || $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DIR) $(DESTDIR)$(MAN8DIR) ifneq ($(BIN),) $(INSTALL_PROG) $(BIN) $(DESTDIR)$(bindir) endif $(INSTALL_PROG) $(SBIN) $(DESTDIR)$(sbindir) $(INSTALL_PYTHON_PROG) $(SCRIPTS) $(DESTDIR)$(bindir) [ -z "$(LIBBIN)" ] || $(INSTALL_PROG) $(LIBBIN) $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_DATA) $(MAN8) $(DESTDIR)$(MAN8DIR) .PHONY: clean clean: diff --git a/tools/xentrace/xentrace.8 b/tools/xentrace/xentrace.8 deleted file mode 100644 index 7b3172b..0000000 --- a/tools/xentrace/xentrace.8 +++ /dev/null @@ -1,164 +0,0 @@ -.TH XENTRACE 8 "22 February 2007" "Xen domain 0 utils" -.SH NAME -xentrace \- capture Xen trace buffer data -.SH SYNOPSIS -.B xentrace -[ -.I OPTIONS -] [ -.I FILE -] -.SH DESCRIPTION -.B xentrace -is used to capture trace buffer data from Xen. The data is -output in the following binary format (host endian): -.PP - CPU(uint) TSC(u64) EVENT(u32) D1 D2 D3 D4 D5 (all u32) -.PP -Where CPU is the processor number, TSC is the record's timestamp -(the value of the CPU cycle counter), EVENT is the event ID and -D1...D5 are the trace data. - -Data is dumped onto the standard output (which must not be a TTY) or a -\fIFILE\fP specified on the command line. - -The output should be parsed using the tool xentrace_format, which can -produce human-readable output in ASCII format. - - -.SS Options -.TP -.B -t, --log-thresh=l -set the threshold number, l, of new records required to trigger a write of -all new records to the output -.TP -.B -s, --poll-sleep=p -set the time, p, (in milliseconds) to sleep between polling the buffers -for new data. -.TP -.B -c, --cpu-mask=[\fIc\fP|\fICPU-LIST\fP|\fIall\fP] -This can be: a hex value (of the form 0xNNNN...), or a set of cpu -ranges as described below, or the string \fIall\fP. Hex values are limited -to 32 bits. If not specified, the cpu-mask as set during bootup will be -constructed. If using the \fICPU-LIST\fP it expects decimal numbers, which -may be specified as follows: - -.RS 4 -.ie n .IP """0-3""" 4 -.el .IP "``0-3''" 4 -.IX Item "0-3" -Trace only on CPUs 0 through 3 -.ie n .IP """0,2,5-7""" 4 -.el .IP "``0,2,5-7''" 4 -.IX Item "0,2,5-7" -Trace only on CPUs 0, 2, and 5 through 7. -.ie n .IP """-3""" 4 -.el .IP "``-3''" 4 -.IX Item "-3" -Trace only on CPUs 0 through 3 -.ie n .IP """-3,7""" 4 -.el .IP "``-3,7''" 4 -.IX Item "-3,7" -Trace only on CPUs 0 through 3 and 7 -.ie n .IP """3-""" 4 -.el .IP "``3-''" 4 -.IX Item "-3-" -Trace only on CPUs 3 up to maximum numbers of CPUs the host has. -.RE -.Sp - -If using \fIall\fP it will use all of the CPUs the host has. -.TP -.B -e, --evt-mask=e -set event capture mask. If not specified the TRC_ALL will be used. -.TP -.B -?, --help -Give this help list -.TP -.B --usage -Give a short usage message -.TP -.B -V, --version -Print program version - -.SS Event Classes (Masks) -The following event classes (masks) can be used to filter the events being -gathered by xentrace: -.PP - \fIID\fP \fIDescription\fP -.PP - 0x0001f000 TRC_GEN - 0x0002f000 TRC_SCHED - 0x0004f000 TRC_DOM0OP - 0x0008f000 TRC_HVM - 0x0010f000 TRC_MEM - 0xfffff000 TRC_ALL - - -.SS Event Subclasses (More Masks) -The following event subclasses (masks) can also be used to filter the events being -gathered by xentrace: -.PP - \fIID\fP \fIDescription\fP -.PP - 0x00081000 TRC_HVM_ENTRYEXIT - 0x00082000 TRC_HVM_HANDLER - - -.SS Events -.B xentrace -collects the following events from the trace buffer: -.PP - \fIID\fP \fIDescription\fP -.PP - 0x0001f001 TRC_LOST_RECORDS - 0x0002f001 TRC_SCHED_DOM_ADD - 0x0002f002 TRC_SCHED_DOM_REM - 0x0002f003 TRC_SCHED_SLEEP - 0x0002f004 TRC_SCHED_WAKE - 0x0002f005 TRC_SCHED_YIELD - 0x0002f006 TRC_SCHED_BLOCK - 0x0002f007 TRC_SCHED_SHUTDOWN - 0x0002f008 TRC_SCHED_CTL - 0x0002f009 TRC_SCHED_ADJDOM - 0x0002f010 TRC_SCHED_SWITCH - 0x0002f011 TRC_SCHED_S_TIMER_FN - 0x0002f012 TRC_SCHED_T_TIMER_FN - 0x0002f013 TRC_SCHED_DOM_TIMER_FN - 0x0002f014 TRC_SCHED_SWITCH_INFPREV - 0x0002f015 TRC_SCHED_SWITCH_INFNEXT - - 0x00081001 TRC_HVM_VMENTRY - 0x00081002 TRC_HVM_VMEXIT - 0x00082001 TRC_HVM_PF_XEN - 0x00082002 TRC_HVM_PF_INJECT - 0x00082003 TRC_HVM_INJ_EXC - 0x00082004 TRC_HVM_INJ_VIRQ - 0x00082005 TRC_HVM_REINJ_VIRQ - 0x00082006 TRC_HVM_IO_READ - 0x00082007 TRC_HVM_IO_WRITE - 0x00082008 TRC_HVM_CR_READ - 0x00082009 TRC_HVM_CR_WRITE - 0x0008200A TRC_HVM_DR_READ - 0x0008200B TRC_HVM_DR_WRITE - 0x0008200C TRC_HVM_MSR_READ - 0x0008200D TRC_HVM_MSR_WRITE - 0x0008200E TRC_HVM_CPUID - 0x0008200F TRC_HVM_INTR - 0x00082010 TRC_HVM_NMI - 0x00082011 TRC_HVM_SMI - 0x00082012 TRC_HVM_VMMCALL - 0x00082013 TRC_HVM_HLT - 0x00082014 TRC_HVM_INVLPG - - 0x0010f001 TRC_MEM_PAGE_GRANT_MAP - 0x0010f002 TRC_MEM_PAGE_GRANT_UNMAP - 0x0010f003 TRC_MEM_PAGE_GRANT_TRANSFER - -.PP - -.SH AUTHOR -Mark A. Williamson - -.SH "SEE ALSO" -xentrace_format(1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFg-00074X-Rn; Tue, 01 Sep 2015 10:57:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFg-00074H-5R for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:20 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id AC/A4-18886-F8485E55; Tue, 01 Sep 2015 10:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1441105037!34313708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9839 invoked from network); 1 Sep 2015 10:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFd-00021T-6q for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFd-00054C-5s for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:17 +0000 Date: Tue, 01 Sep 2015 10:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Fix installation of man8 pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a05af24592b4a577361ff318a721b4fb2e8cd0c Author: Andrew Cooper AuthorDate: Thu Aug 27 20:13:16 2015 +0100 Commit: Ian Jackson CommitDate: Fri Aug 28 10:49:41 2015 +0100 docs: Fix installation of man8 pages c/s a430436 "docs: Support for generating man(8) pages" accidentally failed to update to the install and clean rules for man8 pages, meaning that c/s 7b21214 "docs: Move xentrace.8 to docs/man/xentrace.pod.8" caused a packaging regression when it came to xentop.8 To avoid similar bugs in the future, move the generation of the build, install and clean rules into the manpage metarule. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- docs/Makefile | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 3d77913..d25e6c7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -58,20 +58,15 @@ else @echo "fig2dev (transfig) not installed; skipping figs." endif -.PHONY: man-pages -man-pages: $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN8) - .PHONY: pdf pdf: $(DOC_PDF) .PHONY: clean -clean: +clean: clean-man-pages $(MAKE) -C figs clean rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ rm -rf *.ilg *.log *.ind *.toc *.bak *.tmp core rm -rf html txt pdf - rm -rf man5 - rm -rf man1 .PHONY: distclean distclean: clean @@ -80,6 +75,8 @@ distclean: clean # Top level install targets +.PHONY: man-pages install-man-pages clean-man-pages + # Metarules for generating manpages. Run with $(1) substitued for section define GENERATE_MANPAGE_RULES @@ -110,17 +107,31 @@ else @echo "pod2text not installed; skipping $$@" endif +# Build +.PHONY: man$(1)-pages +man$(1)-pages: $$(DOC_MAN$(1)) + +# Install +.PHONY: install-man$(1)-pages +install-man$(1)-pages: man$(1)-pages + $(INSTALL_DIR) $(DESTDIR)$(mandir) + cp -r man$(1) $(DESTDIR)$(mandir) + +# Clean +.PHONY: clean-man$(1)-pages +clean-man$(1)-pages: + rm -rf man$(1) + +# Link buld/install/clean to toplevel rules +man-pages: man$(1)-pages +install-man-pages: install-man$(1)-pages +clean-man-pages: clean-man$(1)-pages + endef # Generate manpage rules for each section $(foreach i,1 5 8,$(eval $(call GENERATE_MANPAGE_RULES,$(i)))) -.PHONY: install-man-pages -install-man-pages: man-pages - $(INSTALL_DIR) $(DESTDIR)$(mandir) - cp -R man1 $(DESTDIR)$(mandir) - cp -R man5 $(DESTDIR)$(mandir) - .PHONY: install-html install-html: html txt figs $(INSTALL_DIR) $(DESTDIR)$(docdir) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFg-00074X-Rn; Tue, 01 Sep 2015 10:57:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFg-00074H-5R for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:20 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id AC/A4-18886-F8485E55; Tue, 01 Sep 2015 10:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1441105037!34313708!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9839 invoked from network); 1 Sep 2015 10:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFd-00021T-6q for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFd-00054C-5s for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:17 +0000 Date: Tue, 01 Sep 2015 10:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Fix installation of man8 pages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a05af24592b4a577361ff318a721b4fb2e8cd0c Author: Andrew Cooper AuthorDate: Thu Aug 27 20:13:16 2015 +0100 Commit: Ian Jackson CommitDate: Fri Aug 28 10:49:41 2015 +0100 docs: Fix installation of man8 pages c/s a430436 "docs: Support for generating man(8) pages" accidentally failed to update to the install and clean rules for man8 pages, meaning that c/s 7b21214 "docs: Move xentrace.8 to docs/man/xentrace.pod.8" caused a packaging regression when it came to xentop.8 To avoid similar bugs in the future, move the generation of the build, install and clean rules into the manpage metarule. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- docs/Makefile | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 3d77913..d25e6c7 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -58,20 +58,15 @@ else @echo "fig2dev (transfig) not installed; skipping figs." endif -.PHONY: man-pages -man-pages: $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN8) - .PHONY: pdf pdf: $(DOC_PDF) .PHONY: clean -clean: +clean: clean-man-pages $(MAKE) -C figs clean rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ rm -rf *.ilg *.log *.ind *.toc *.bak *.tmp core rm -rf html txt pdf - rm -rf man5 - rm -rf man1 .PHONY: distclean distclean: clean @@ -80,6 +75,8 @@ distclean: clean # Top level install targets +.PHONY: man-pages install-man-pages clean-man-pages + # Metarules for generating manpages. Run with $(1) substitued for section define GENERATE_MANPAGE_RULES @@ -110,17 +107,31 @@ else @echo "pod2text not installed; skipping $$@" endif +# Build +.PHONY: man$(1)-pages +man$(1)-pages: $$(DOC_MAN$(1)) + +# Install +.PHONY: install-man$(1)-pages +install-man$(1)-pages: man$(1)-pages + $(INSTALL_DIR) $(DESTDIR)$(mandir) + cp -r man$(1) $(DESTDIR)$(mandir) + +# Clean +.PHONY: clean-man$(1)-pages +clean-man$(1)-pages: + rm -rf man$(1) + +# Link buld/install/clean to toplevel rules +man-pages: man$(1)-pages +install-man-pages: install-man$(1)-pages +clean-man-pages: clean-man$(1)-pages + endef # Generate manpage rules for each section $(foreach i,1 5 8,$(eval $(call GENERATE_MANPAGE_RULES,$(i)))) -.PHONY: install-man-pages -install-man-pages: man-pages - $(INSTALL_DIR) $(DESTDIR)$(mandir) - cp -R man1 $(DESTDIR)$(mandir) - cp -R man5 $(DESTDIR)$(mandir) - .PHONY: install-html install-html: html txt figs $(INSTALL_DIR) $(DESTDIR)$(docdir) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFr-0007B7-1T; Tue, 01 Sep 2015 10:57:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFp-00079B-Q3 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:29 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id DC/A0-23203-99485E55; Tue, 01 Sep 2015 10:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1441105047!40047248!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30090 invoked from network); 1 Sep 2015 10:57:28 -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; 1 Sep 2015 10:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFn-00021c-Dk for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFn-00054Y-BV for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:27 +0000 Date: Tue, 01 Sep 2015 10:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vmx: fix vmx_is_singlestep_supported return value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 340ade2f0ef692efce01a708ad98629af985f978 Author: Tamas K Lengyel AuthorDate: Fri Aug 28 12:17:05 2015 +0200 Commit: Jan Beulich CommitDate: Fri Aug 28 12:17:05 2015 +0200 x86/vmx: fix vmx_is_singlestep_supported return value The function supposed to return a boolean but instead it returned the value 0x8000000 which is the Intel internal flag for MTF. This has caused various checks using this function to falsely report no MTF capability. Signed-off-by: Tamas K Lengyel Reviewed-by: Andrew Cooper Acked-by: Kevin Tian Release-acked-by: Wei Liu --- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 999defe..2582cdd 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1768,7 +1768,7 @@ static void vmx_enable_msr_exit_interception(struct domain *d) static bool_t vmx_is_singlestep_supported(void) { - return cpu_has_monitor_trap_flag; + return !!cpu_has_monitor_trap_flag; } static void vmx_vcpu_update_eptp(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFr-0007B7-1T; Tue, 01 Sep 2015 10:57:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFp-00079B-Q3 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:29 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id DC/A0-23203-99485E55; Tue, 01 Sep 2015 10:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1441105047!40047248!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30090 invoked from network); 1 Sep 2015 10:57:28 -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; 1 Sep 2015 10:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFn-00021c-Dk for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFn-00054Y-BV for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:27 +0000 Date: Tue, 01 Sep 2015 10:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vmx: fix vmx_is_singlestep_supported return value X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 340ade2f0ef692efce01a708ad98629af985f978 Author: Tamas K Lengyel AuthorDate: Fri Aug 28 12:17:05 2015 +0200 Commit: Jan Beulich CommitDate: Fri Aug 28 12:17:05 2015 +0200 x86/vmx: fix vmx_is_singlestep_supported return value The function supposed to return a boolean but instead it returned the value 0x8000000 which is the Intel internal flag for MTF. This has caused various checks using this function to falsely report no MTF capability. Signed-off-by: Tamas K Lengyel Reviewed-by: Andrew Cooper Acked-by: Kevin Tian Release-acked-by: Wei Liu --- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 999defe..2582cdd 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1768,7 +1768,7 @@ static void vmx_enable_msr_exit_interception(struct domain *d) static bool_t vmx_is_singlestep_supported(void) { - return cpu_has_monitor_trap_flag; + return !!cpu_has_monitor_trap_flag; } static void vmx_vcpu_update_eptp(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjG1-0007Dq-4s; Tue, 01 Sep 2015 10:57:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFz-0007DO-V1 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:40 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 3E/9A-01421-3A485E55; Tue, 01 Sep 2015 10:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1441105057!38804997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3662 invoked from network); 1 Sep 2015 10:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFx-00021k-J6 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFx-00054v-I1 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:37 +0000 Date: Tue, 01 Sep 2015 10:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 801ab48e5556cb54f67e3cb57f077f47e8663ced Author: Ian Jackson AuthorDate: Fri Aug 28 16:01:55 2015 +0100 Commit: Ian Jackson CommitDate: Fri Aug 28 16:01:55 2015 +0100 QEMU_TAG update --- Config.mk | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 75b49a3..ca73ce3 100644 --- a/Config.mk +++ b/Config.mk @@ -266,10 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.6.0-rc1 -# 7f057440b31da38196e3398fd1b618fc36ad97d6 -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TRADITIONAL_REVISION ?= 5cdde31eacdd288359746019ad05cac8ed5d9f70 +# Fri Aug 28 15:53:40 2015 +0100 +# HVM: atomically access pointers in bufioreq handling # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 01 10:57:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 01 Sep 2015 10:57:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjG1-0007Dq-4s; Tue, 01 Sep 2015 10:57:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFz-0007DO-V1 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:40 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 3E/9A-01421-3A485E55; Tue, 01 Sep 2015 10:57:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1441105057!38804997!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3662 invoked from network); 1 Sep 2015 10:57:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 1 Sep 2015 10:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZWjFx-00021k-J6 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZWjFx-00054v-I1 for xen-changelog@lists.xensource.com; Tue, 01 Sep 2015 10:57:37 +0000 Date: Tue, 01 Sep 2015 10:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 801ab48e5556cb54f67e3cb57f077f47e8663ced Author: Ian Jackson AuthorDate: Fri Aug 28 16:01:55 2015 +0100 Commit: Ian Jackson CommitDate: Fri Aug 28 16:01:55 2015 +0100 QEMU_TAG update --- Config.mk | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 75b49a3..ca73ce3 100644 --- a/Config.mk +++ b/Config.mk @@ -266,10 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.6.0-rc1 -# 7f057440b31da38196e3398fd1b618fc36ad97d6 -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TRADITIONAL_REVISION ?= 5cdde31eacdd288359746019ad05cac8ed5d9f70 +# Fri Aug 28 15:53:40 2015 +0100 +# HVM: atomically access pointers in bufioreq handling # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 08 08:55:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 08 Sep 2015 08: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 1ZZEgL-0003ml-2s; Tue, 08 Sep 2015 08:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZEgJ-0003mg-I4 for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 08:55:11 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 65/72-02324-E62AEE55; Tue, 08 Sep 2015 08:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1441702509!28214847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10219 invoked from network); 8 Sep 2015 08:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2015 08:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZEgB-0002ho-5c for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 08:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZEgA-0007o2-4K for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 08:55:02 +0000 Date: Tue, 08 Sep 2015 08:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: mm: Do not dump the p2m when mapping a foreign gfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ef89dc8c00087c8c1819e60bdad5527db70425e1 Author: Julien Grall AuthorDate: Thu Aug 13 12:03:43 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 14:03:31 2015 +0100 xen/arm: mm: Do not dump the p2m when mapping a foreign gfn The physmap operation XENMAPSPACE_gfmn_foreign is dumping the p2m when an error occured by calling dump_p2m_lookup. But this function is not using ratelimited printk. Any domain able to map foreign gfmn would be able to flood the Xen console. The information wasn't not useful so drop it. This is XSA-141. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit afc13fe5e21d18c09e44f8ae6f7f4484e9f1de7f) --- xen/arch/arm/mm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 7d4ba0c..7d95961 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1103,7 +1103,6 @@ int xenmem_add_to_physmap_one( page = get_page_from_gfn(od, idx, &p2mt, P2M_ALLOC); if ( !page ) { - dump_p2m_lookup(od, pfn_to_paddr(idx)); rcu_unlock_domain(od); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 08 08:55:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 08 Sep 2015 08: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 1ZZEgL-0003ml-2s; Tue, 08 Sep 2015 08:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZEgJ-0003mg-I4 for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 08:55:11 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 65/72-02324-E62AEE55; Tue, 08 Sep 2015 08:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1441702509!28214847!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10219 invoked from network); 8 Sep 2015 08:55:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2015 08:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZEgB-0002ho-5c for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 08:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZEgA-0007o2-4K for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 08:55:02 +0000 Date: Tue, 08 Sep 2015 08:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xen/arm: mm: Do not dump the p2m when mapping a foreign gfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ef89dc8c00087c8c1819e60bdad5527db70425e1 Author: Julien Grall AuthorDate: Thu Aug 13 12:03:43 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 14:03:31 2015 +0100 xen/arm: mm: Do not dump the p2m when mapping a foreign gfn The physmap operation XENMAPSPACE_gfmn_foreign is dumping the p2m when an error occured by calling dump_p2m_lookup. But this function is not using ratelimited printk. Any domain able to map foreign gfmn would be able to flood the Xen console. The information wasn't not useful so drop it. This is XSA-141. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit afc13fe5e21d18c09e44f8ae6f7f4484e9f1de7f) --- xen/arch/arm/mm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 7d4ba0c..7d95961 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1103,7 +1103,6 @@ int xenmem_add_to_physmap_one( page = get_page_from_gfn(od, idx, &p2mt, P2M_ALLOC); if ( !page ) { - dump_p2m_lookup(od, pfn_to_paddr(idx)); rcu_unlock_domain(od); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 08 14:22:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 08 Sep 2015 14: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 1ZZJmg-000634-Vm; Tue, 08 Sep 2015 14: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 1ZZJmf-00062O-6H for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:22:05 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 20/0D-28221-C0FEEE55; Tue, 08 Sep 2015 14:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1441722122!47855632!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5294 invoked from network); 8 Sep 2015 14:22:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2015 14:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZJmc-00069I-FY for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZJmc-0006jp-9E for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:22:02 +0000 Date: Tue, 08 Sep 2015 14:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] ui/vnc: limit client_cut_text msg payload 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 2b5684137e81251c37e349525e869e6a076f9574 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Tue Sep 8 15:07:06 2015 +0100 ui/vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann (cherry picked from commit f9a70e79391f6d7c2a912d785239ee8effc1922d) Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..86c2ff4 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + error_report("vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 08 14:22:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 08 Sep 2015 14: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 1ZZJmg-000634-Vm; Tue, 08 Sep 2015 14: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 1ZZJmf-00062O-6H for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:22:05 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 20/0D-28221-C0FEEE55; Tue, 08 Sep 2015 14:22:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1441722122!47855632!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5294 invoked from network); 8 Sep 2015 14:22:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2015 14:22:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZJmc-00069I-FY for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:22:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZJmc-0006jp-9E for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:22:02 +0000 Date: Tue, 08 Sep 2015 14:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] ui/vnc: limit client_cut_text msg payload 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 2b5684137e81251c37e349525e869e6a076f9574 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Tue Sep 8 15:07:06 2015 +0100 ui/vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann (cherry picked from commit f9a70e79391f6d7c2a912d785239ee8effc1922d) Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..86c2ff4 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + error_report("vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 08 14:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 08 Sep 2015 14: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 1ZZKIm-0001xl-Ru; Tue, 08 Sep 2015 14:55:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZKIl-0001xP-HN for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:55:15 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 29/D1-06021-2D6FEE55; Tue, 08 Sep 2015 14:55:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1441724113!42488677!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 871 invoked from network); 8 Sep 2015 14:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2015 14:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZKIZ-0006Uu-47 for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZKIY-0000W4-1D for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:55:02 +0000 Date: Tue, 08 Sep 2015 14:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] Fix build after "ui/vnc: limit client_cut_text msg payload 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 1c8d43cbdf0fc01a8f05acfbf55b805a83da34bb Author: Ian Jackson AuthorDate: Tue Sep 8 15:41:20 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 8 15:42:31 2015 +0100 Fix build after "ui/vnc: limit client_cut_text msg payload size" That backport (which also erroneously refers to ui/vnc.c rather than vnc.c in its commit message) broke the build because we do not have `error_report'. Use fprintf to stderr, like the rest of the file. Signed-off-by: Ian Jackson --- vnc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vnc.c b/vnc.c index 86c2ff4..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1769,8 +1769,8 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) uint32_t v; v = read_u32(data, 4); if (v > (1 << 20)) { - error_report("vnc: client_cut_text msg payload has %u bytes" - " which exceeds our limit of 1MB.", v); + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); vnc_client_error(vs); break; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 08 14:55:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 08 Sep 2015 14: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 1ZZKIm-0001xl-Ru; Tue, 08 Sep 2015 14:55:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZKIl-0001xP-HN for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:55:15 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 29/D1-06021-2D6FEE55; Tue, 08 Sep 2015 14:55:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1441724113!42488677!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 871 invoked from network); 8 Sep 2015 14:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2015 14:55:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZKIZ-0006Uu-47 for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZKIY-0000W4-1D for xen-changelog@lists.xensource.com; Tue, 08 Sep 2015 14:55:02 +0000 Date: Tue, 08 Sep 2015 14:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] Fix build after "ui/vnc: limit client_cut_text msg payload 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 1c8d43cbdf0fc01a8f05acfbf55b805a83da34bb Author: Ian Jackson AuthorDate: Tue Sep 8 15:41:20 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 8 15:42:31 2015 +0100 Fix build after "ui/vnc: limit client_cut_text msg payload size" That backport (which also erroneously refers to ui/vnc.c rather than vnc.c in its commit message) broke the build because we do not have `error_report'. Use fprintf to stderr, like the rest of the file. Signed-off-by: Ian Jackson --- vnc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vnc.c b/vnc.c index 86c2ff4..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1769,8 +1769,8 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) uint32_t v; v = read_u32(data, 4); if (v > (1 << 20)) { - error_report("vnc: client_cut_text msg payload has %u bytes" - " which exceeds our limit of 1MB.", v); + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); vnc_client_error(vs); break; } -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:00: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 1ZZaIg-0004oX-BR; Wed, 09 Sep 2015 08:00:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIe-0004oC-D3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:12 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 04/DE-30270-B07EFE55; Wed, 09 Sep 2015 08:00:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-206.messagelabs.com!1441785609!33769924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6706 invoked from network); 9 Sep 2015 08:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIW-0007vO-4S for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaIV-0008OE-6N for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:03 +0000 Message-Id: Date: Wed, 09 Sep 2015 08:00:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: fix off by one determining when to copy a RX skb X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1441785095 -7200 # Node ID 36fb301948766f3ac9efbf87f16595d50dbc41b9 # Parent 9c891c830cddb69cca1cf6e908cafdfaa5e895af netback: fix off by one determining when to copy a RX skb Copying is needed only when page offset plus length of head exceeds PAGE_SIZE, not when their sum equals it. Signed-off-by: Jan Beulich --- diff -r 9c891c830cdd -r 36fb30194876 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Wed Sep 09 09:49:03 2015 +0200 +++ b/drivers/xen/netback/netback.c Wed Sep 09 09:51:35 2015 +0200 @@ -309,7 +309,7 @@ int netif_be_start_xmit(struct sk_buff * * boundary, because netbk_gop_skb can't handle them. */ if (!netif->copying_receiver || - ((skb_headlen(skb) + offset_in_page(skb->data)) >= PAGE_SIZE)) { + ((offset_in_page(skb->data) + skb_headlen(skb)) > PAGE_SIZE)) { struct sk_buff *nskb = netbk_copy_skb(skb); if ( unlikely(nskb == NULL) ) goto drop; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:00: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 1ZZaIf-0004oQ-92; Wed, 09 Sep 2015 08:00:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIe-0004oB-80 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:12 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 97/54-23203-B07EFE55; Wed, 09 Sep 2015 08:00:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1441785609!11480504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31847 invoked from network); 9 Sep 2015 08:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIU-0007vN-SS for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaIU-0008Ns-Qw for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:02 +0000 Message-Id: Date: Wed, 09 Sep 2015 08:00:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netfront: correct printf format in xennet_get_responses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Julien Grall # Date 1441784943 -7200 # Node ID 9c891c830cddb69cca1cf6e908cafdfaa5e895af # Parent 8f6b99f4c45fbee6c5911fbd0835353b9de1fdeb netfront: correct printf format in xennet_get_responses rx->status is an int16_t, print it using %d rather than %u in order to have a meaningful value when the field is negative. Also use %u rather than %x for rx->offset. Signed-off-by: Julien Grall Keep hex format for rx->offset, but make obvious it's hex. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 8f6b99f4c45f -r 9c891c830cdd drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Tue Jun 02 16:13:42 2015 +0200 +++ b/drivers/xen/netfront/netfront.c Wed Sep 09 09:49:03 2015 +0200 @@ -1175,7 +1175,7 @@ static int xennet_get_responses(struct n if (unlikely(rx->status < 0 || rx->offset + rx->status > PAGE_SIZE)) { if (net_ratelimit()) - WPRINTK("rx->offset: %x, size: %u\n", + WPRINTK("rx->offset: %#x, size: %d\n", rx->offset, rx->status); xennet_move_rx_slot(np, skb, ref); err = -EINVAL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:00: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 1ZZaIg-0004oX-BR; Wed, 09 Sep 2015 08:00:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIe-0004oC-D3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:12 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 04/DE-30270-B07EFE55; Wed, 09 Sep 2015 08:00:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-5.tower-206.messagelabs.com!1441785609!33769924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6706 invoked from network); 9 Sep 2015 08:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIW-0007vO-4S for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaIV-0008OE-6N for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:03 +0000 Message-Id: Date: Wed, 09 Sep 2015 08:00:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: fix off by one determining when to copy a RX skb X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1441785095 -7200 # Node ID 36fb301948766f3ac9efbf87f16595d50dbc41b9 # Parent 9c891c830cddb69cca1cf6e908cafdfaa5e895af netback: fix off by one determining when to copy a RX skb Copying is needed only when page offset plus length of head exceeds PAGE_SIZE, not when their sum equals it. Signed-off-by: Jan Beulich --- diff -r 9c891c830cdd -r 36fb30194876 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Wed Sep 09 09:49:03 2015 +0200 +++ b/drivers/xen/netback/netback.c Wed Sep 09 09:51:35 2015 +0200 @@ -309,7 +309,7 @@ int netif_be_start_xmit(struct sk_buff * * boundary, because netbk_gop_skb can't handle them. */ if (!netif->copying_receiver || - ((skb_headlen(skb) + offset_in_page(skb->data)) >= PAGE_SIZE)) { + ((offset_in_page(skb->data) + skb_headlen(skb)) > PAGE_SIZE)) { struct sk_buff *nskb = netbk_copy_skb(skb); if ( unlikely(nskb == NULL) ) goto drop; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:00: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 1ZZaIf-0004oQ-92; Wed, 09 Sep 2015 08:00:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIe-0004oB-80 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:12 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 97/54-23203-B07EFE55; Wed, 09 Sep 2015 08:00:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1441785609!11480504!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31847 invoked from network); 9 Sep 2015 08:00:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIU-0007vN-SS for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaIU-0008Ns-Qw for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:02 +0000 Message-Id: Date: Wed, 09 Sep 2015 08:00:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netfront: correct printf format in xennet_get_responses X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Julien Grall # Date 1441784943 -7200 # Node ID 9c891c830cddb69cca1cf6e908cafdfaa5e895af # Parent 8f6b99f4c45fbee6c5911fbd0835353b9de1fdeb netfront: correct printf format in xennet_get_responses rx->status is an int16_t, print it using %d rather than %u in order to have a meaningful value when the field is negative. Also use %u rather than %x for rx->offset. Signed-off-by: Julien Grall Keep hex format for rx->offset, but make obvious it's hex. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r 8f6b99f4c45f -r 9c891c830cdd drivers/xen/netfront/netfront.c --- a/drivers/xen/netfront/netfront.c Tue Jun 02 16:13:42 2015 +0200 +++ b/drivers/xen/netfront/netfront.c Wed Sep 09 09:49:03 2015 +0200 @@ -1175,7 +1175,7 @@ static int xennet_get_responses(struct n if (unlikely(rx->status < 0 || rx->offset + rx->status > PAGE_SIZE)) { if (net_ratelimit()) - WPRINTK("rx->offset: %x, size: %u\n", + WPRINTK("rx->offset: %#x, size: %d\n", rx->offset, rx->status); xennet_move_rx_slot(np, skb, ref); err = -EINVAL; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:00: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 1ZZaIg-0004oe-Dp; Wed, 09 Sep 2015 08:00:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIe-0004oD-Q1 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:12 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 21/5B-29649-C07EFE55; Wed, 09 Sep 2015 08:00:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-31.messagelabs.com!1441785609!40256723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4611 invoked from network); 9 Sep 2015 08:00:10 -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; 9 Sep 2015 08:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIW-0007vP-Fy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaIV-0008OY-Hd for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:03 +0000 Message-Id: Date: Wed, 09 Sep 2015 08:00:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: maintain stats for both kinds of copied SKBs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1441785142 -7200 # Node ID b4bb467e5c077745957e26ea6872cfc65e87e4c2 # Parent 36fb301948766f3ac9efbf87f16595d50dbc41b9 netback: maintain stats for both kinds of copied SKBs The copying on the (guest) receive path is expensive, so worth keeping an eye on too. Signed-off-by: Jan Beulich --- diff -r 36fb30194876 -r b4bb467e5c07 drivers/xen/netback/common.h --- a/drivers/xen/netback/common.h Wed Sep 09 09:51:35 2015 +0200 +++ b/drivers/xen/netback/common.h Wed Sep 09 09:52:22 2015 +0200 @@ -93,7 +93,8 @@ typedef struct netif_st { struct timer_list tx_queue_timeout; /* Statistics */ - unsigned long nr_copied_skbs; + unsigned long nr_copied_rx_skbs; + unsigned long nr_copied_tx_skbs; /* Miscellaneous private stuff. */ struct list_head list; /* scheduling list */ diff -r 36fb30194876 -r b4bb467e5c07 drivers/xen/netback/interface.c --- a/drivers/xen/netback/interface.c Wed Sep 09 09:51:35 2015 +0200 +++ b/drivers/xen/netback/interface.c Wed Sep 09 09:52:22 2015 +0200 @@ -176,7 +176,8 @@ static const struct netif_stat { char name[ETH_GSTRING_LEN]; u16 offset; } netbk_stats[] = { - { "copied_skbs", offsetof(netif_t, nr_copied_skbs) / sizeof(long) }, + { "copied_rx_skbs", offsetof(netif_t, nr_copied_rx_skbs) / sizeof(long) }, + { "copied_tx_skbs", offsetof(netif_t, nr_copied_tx_skbs) / sizeof(long) }, }; static int netbk_get_stats_count(struct net_device *dev) diff -r 36fb30194876 -r b4bb467e5c07 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Wed Sep 09 09:51:35 2015 +0200 +++ b/drivers/xen/netback/netback.c Wed Sep 09 09:52:22 2015 +0200 @@ -319,6 +319,7 @@ int netif_be_start_xmit(struct sk_buff * nskb->proto_data_valid = skb->proto_data_valid; dev_kfree_skb(skb); skb = nskb; + netif->nr_copied_rx_skbs++; } netif->rx_req_cons_peek += skb_shinfo(skb)->nr_frags + 1 + @@ -969,7 +970,7 @@ inline static void net_tx_action_dealloc pending_idx = inuse - pending_inuse; - pending_tx_info[pending_idx].netif->nr_copied_skbs++; + pending_tx_info[pending_idx].netif->nr_copied_tx_skbs++; switch (copy_pending_req(pending_idx)) { case 0: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:00: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 1ZZaIg-0004oe-Dp; Wed, 09 Sep 2015 08:00:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIe-0004oD-Q1 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:12 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 21/5B-29649-C07EFE55; Wed, 09 Sep 2015 08:00:12 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-31.messagelabs.com!1441785609!40256723!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4611 invoked from network); 9 Sep 2015 08:00:10 -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; 9 Sep 2015 08:00:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaIW-0007vP-Fy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaIV-0008OY-Hd for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:00:03 +0000 Message-Id: Date: Wed, 09 Sep 2015 08:00:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: maintain stats for both kinds of copied SKBs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1441785142 -7200 # Node ID b4bb467e5c077745957e26ea6872cfc65e87e4c2 # Parent 36fb301948766f3ac9efbf87f16595d50dbc41b9 netback: maintain stats for both kinds of copied SKBs The copying on the (guest) receive path is expensive, so worth keeping an eye on too. Signed-off-by: Jan Beulich --- diff -r 36fb30194876 -r b4bb467e5c07 drivers/xen/netback/common.h --- a/drivers/xen/netback/common.h Wed Sep 09 09:51:35 2015 +0200 +++ b/drivers/xen/netback/common.h Wed Sep 09 09:52:22 2015 +0200 @@ -93,7 +93,8 @@ typedef struct netif_st { struct timer_list tx_queue_timeout; /* Statistics */ - unsigned long nr_copied_skbs; + unsigned long nr_copied_rx_skbs; + unsigned long nr_copied_tx_skbs; /* Miscellaneous private stuff. */ struct list_head list; /* scheduling list */ diff -r 36fb30194876 -r b4bb467e5c07 drivers/xen/netback/interface.c --- a/drivers/xen/netback/interface.c Wed Sep 09 09:51:35 2015 +0200 +++ b/drivers/xen/netback/interface.c Wed Sep 09 09:52:22 2015 +0200 @@ -176,7 +176,8 @@ static const struct netif_stat { char name[ETH_GSTRING_LEN]; u16 offset; } netbk_stats[] = { - { "copied_skbs", offsetof(netif_t, nr_copied_skbs) / sizeof(long) }, + { "copied_rx_skbs", offsetof(netif_t, nr_copied_rx_skbs) / sizeof(long) }, + { "copied_tx_skbs", offsetof(netif_t, nr_copied_tx_skbs) / sizeof(long) }, }; static int netbk_get_stats_count(struct net_device *dev) diff -r 36fb30194876 -r b4bb467e5c07 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Wed Sep 09 09:51:35 2015 +0200 +++ b/drivers/xen/netback/netback.c Wed Sep 09 09:52:22 2015 +0200 @@ -319,6 +319,7 @@ int netif_be_start_xmit(struct sk_buff * nskb->proto_data_valid = skb->proto_data_valid; dev_kfree_skb(skb); skb = nskb; + netif->nr_copied_rx_skbs++; } netif->rx_req_cons_peek += skb_shinfo(skb)->nr_frags + 1 + @@ -969,7 +970,7 @@ inline static void net_tx_action_dealloc pending_idx = inuse - pending_inuse; - pending_tx_info[pending_idx].netif->nr_copied_skbs++; + pending_tx_info[pending_idx].netif->nr_copied_tx_skbs++; switch (copy_pending_req(pending_idx)) { case 0: _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZadu-0007Dv-WD; Wed, 09 Sep 2015 08:22:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZadt-0007Dq-6L for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:09 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id AA/D1-25435-03CEFE55; Wed, 09 Sep 2015 08:22:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1441786926!45928831!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13188 invoked from network); 9 Sep 2015 08:22:07 -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; 9 Sep 2015 08:22:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZado-0008Sd-Do for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZadn-00013C-E6 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:03 +0000 Date: Wed, 09 Sep 2015 08:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: adjustments to memory_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 ea0b5f0a6b3fe8991cf767770e09addd589102b4 Author: Jan Beulich AuthorDate: Mon Aug 31 13:50:56 2015 +0200 Commit: Jan Beulich CommitDate: Mon Aug 31 13:50:56 2015 +0200 x86: adjustments to memory_add() The function should clean up after a failed map_pages_to_xen(). Sharing the M2P table with Dom0 needs to happen before adding the new pages to the heap (so pages handed out by the allocator will be represented in what a tool stack may need to map). Avoid the IOMMU mapping loop whenever possible. Drop a redundant setting of 'ret'. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 24655d4..d918002 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1376,7 +1376,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) ret = map_pages_to_xen((unsigned long)mfn_to_virt(spfn), spfn, min(epfn, i) - spfn, PAGE_HYPERVISOR); if ( ret ) - return ret; + goto destroy_directmap; } if ( i < epfn ) { @@ -1385,7 +1385,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) ret = map_pages_to_xen((unsigned long)mfn_to_virt(i), i, epfn - i, __PAGE_HYPERVISOR_RW); if ( ret ) - return ret; + goto destroy_directmap; } old_node_start = NODE_DATA(node)->node_start_pfn; @@ -1408,7 +1408,6 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) NODE_DATA(node)->node_spanned_pages = epfn - node_start_pfn(node); } - ret = -EINVAL; info.spfn = spfn; info.epfn = epfn; info.cur = spfn; @@ -1431,7 +1430,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) if ( ret ) goto destroy_m2p; - if ( !need_iommu(hardware_domain) ) + if ( iommu_enabled && !iommu_passthrough && !need_iommu(hardware_domain) ) { for ( i = spfn; i < epfn; i++ ) if ( iommu_map_page(hardware_domain, i, i, IOMMUF_readable|IOMMUF_writable) ) @@ -1445,9 +1444,8 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) } /* We can't revert any more */ - transfer_pages_to_heap(&info); - share_hotadd_m2p_table(&info); + transfer_pages_to_heap(&info); return 0; @@ -1458,13 +1456,13 @@ destroy_m2p: max_pdx = pfn_to_pdx(max_page - 1) + 1; destroy_frametable: cleanup_frame_table(&info); - destroy_xen_mappings((unsigned long)mfn_to_virt(spfn), - (unsigned long)mfn_to_virt(epfn)); - if ( !orig_online ) node_set_offline(node); NODE_DATA(node)->node_start_pfn = old_node_start; NODE_DATA(node)->node_spanned_pages = old_node_span; + destroy_directmap: + destroy_xen_mappings((unsigned long)mfn_to_virt(spfn), + (unsigned long)mfn_to_virt(epfn)); 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 Wed Sep 09 08:22:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZadu-0007Dv-WD; Wed, 09 Sep 2015 08:22:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZadt-0007Dq-6L for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:09 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id AA/D1-25435-03CEFE55; Wed, 09 Sep 2015 08:22:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1441786926!45928831!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13188 invoked from network); 9 Sep 2015 08:22:07 -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; 9 Sep 2015 08:22:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZado-0008Sd-Do for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZadn-00013C-E6 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:03 +0000 Date: Wed, 09 Sep 2015 08:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: adjustments to memory_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 ea0b5f0a6b3fe8991cf767770e09addd589102b4 Author: Jan Beulich AuthorDate: Mon Aug 31 13:50:56 2015 +0200 Commit: Jan Beulich CommitDate: Mon Aug 31 13:50:56 2015 +0200 x86: adjustments to memory_add() The function should clean up after a failed map_pages_to_xen(). Sharing the M2P table with Dom0 needs to happen before adding the new pages to the heap (so pages handed out by the allocator will be represented in what a tool stack may need to map). Avoid the IOMMU mapping loop whenever possible. Drop a redundant setting of 'ret'. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 24655d4..d918002 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1376,7 +1376,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) ret = map_pages_to_xen((unsigned long)mfn_to_virt(spfn), spfn, min(epfn, i) - spfn, PAGE_HYPERVISOR); if ( ret ) - return ret; + goto destroy_directmap; } if ( i < epfn ) { @@ -1385,7 +1385,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) ret = map_pages_to_xen((unsigned long)mfn_to_virt(i), i, epfn - i, __PAGE_HYPERVISOR_RW); if ( ret ) - return ret; + goto destroy_directmap; } old_node_start = NODE_DATA(node)->node_start_pfn; @@ -1408,7 +1408,6 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) NODE_DATA(node)->node_spanned_pages = epfn - node_start_pfn(node); } - ret = -EINVAL; info.spfn = spfn; info.epfn = epfn; info.cur = spfn; @@ -1431,7 +1430,7 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) if ( ret ) goto destroy_m2p; - if ( !need_iommu(hardware_domain) ) + if ( iommu_enabled && !iommu_passthrough && !need_iommu(hardware_domain) ) { for ( i = spfn; i < epfn; i++ ) if ( iommu_map_page(hardware_domain, i, i, IOMMUF_readable|IOMMUF_writable) ) @@ -1445,9 +1444,8 @@ int memory_add(unsigned long spfn, unsigned long epfn, unsigned int pxm) } /* We can't revert any more */ - transfer_pages_to_heap(&info); - share_hotadd_m2p_table(&info); + transfer_pages_to_heap(&info); return 0; @@ -1458,13 +1456,13 @@ destroy_m2p: max_pdx = pfn_to_pdx(max_page - 1) + 1; destroy_frametable: cleanup_frame_table(&info); - destroy_xen_mappings((unsigned long)mfn_to_virt(spfn), - (unsigned long)mfn_to_virt(epfn)); - if ( !orig_online ) node_set_offline(node); NODE_DATA(node)->node_start_pfn = old_node_start; NODE_DATA(node)->node_spanned_pages = old_node_span; + destroy_directmap: + destroy_xen_mappings((unsigned long)mfn_to_virt(spfn), + (unsigned long)mfn_to_virt(epfn)); 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 Wed Sep 09 08:22:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZae5-0007Ee-2Q; Wed, 09 Sep 2015 08: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 1ZZae3-0007EU-Qr for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:19 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 3F/46-13905-B3CEFE55; Wed, 09 Sep 2015 08:22:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441786937!33796182!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30039 invoked from network); 9 Sep 2015 08:22:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZae0-0008Sh-LZ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZadz-00013e-Qy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:15 +0000 Date: Wed, 09 Sep 2015 08:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NUMA: fix setup_node() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8f945d36d9bddd5b589ba23c7322b30d623dd084 Author: Jan Beulich AuthorDate: Mon Aug 31 13:51:52 2015 +0200 Commit: Jan Beulich CommitDate: Mon Aug 31 13:51:52 2015 +0200 x86/NUMA: fix setup_node() The function referenced an __initdata object (nodes_found). Since this being a node mask was more complicated than needed, the variable gets replaced by a simple counter. Check at once that the count of nodes doesn't go beyond MAX_NUMNODES. Also consolidate four printk()s related to the function's use into just one. Finally (quite the opposite of the above issue) __init-annotate nodes_cover_memory(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/srat.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 92c89a5..d6ce420 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -25,7 +25,6 @@ static struct acpi_table_slit *__read_mostly acpi_slit; static nodemask_t memory_nodes_parsed __initdata; static nodemask_t processor_nodes_parsed __initdata; -static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; struct pxm2node { @@ -61,11 +60,12 @@ nodeid_t pxm_to_node(unsigned pxm) return NUMA_NO_NODE; } -__devinit nodeid_t setup_node(unsigned pxm) +nodeid_t setup_node(unsigned pxm) { nodeid_t node; unsigned idx; static bool_t warned; + static unsigned nodes_found; BUILD_BUG_ON(MAX_NUMNODES >= NUMA_NO_NODE); @@ -85,15 +85,17 @@ __devinit nodeid_t setup_node(unsigned pxm) goto finish; if (!warned) { - printk(XENLOG_WARNING "More PXMs than available nodes\n"); + printk(KERN_WARNING "SRAT: Too many proximity domains (%#x)\n", + pxm); warned = 1; } return NUMA_NO_NODE; finish: - node = first_unset_node(nodes_found); - node_set(node, nodes_found); + node = nodes_found++; + if (node >= MAX_NUMNODES) + return NUMA_NO_NODE; pxm2node[idx].pxm = pxm; pxm2node[idx].node = node; @@ -219,7 +221,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) pxm = pa->proximity_domain; node = setup_node(pxm); if (node == NUMA_NO_NODE) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -254,7 +255,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) } node = setup_node(pxm); if (node == NUMA_NO_NODE) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -299,7 +299,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) pxm &= 0xff; node = setup_node(pxm); if (node == NUMA_NO_NODE) { - printk(KERN_ERR "SRAT: Too many proximity domains.\n"); bad_srat(); return; } @@ -341,7 +340,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) /* Sanity check to catch more bad SRATs (they are amazingly common). Make sure the PXMs cover all memory. */ -static int nodes_cover_memory(void) +static int __init nodes_cover_memory(void) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZae5-0007Ee-2Q; Wed, 09 Sep 2015 08: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 1ZZae3-0007EU-Qr for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:19 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 3F/46-13905-B3CEFE55; Wed, 09 Sep 2015 08:22:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441786937!33796182!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30039 invoked from network); 9 Sep 2015 08:22:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZae0-0008Sh-LZ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZadz-00013e-Qy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:15 +0000 Date: Wed, 09 Sep 2015 08:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NUMA: fix setup_node() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8f945d36d9bddd5b589ba23c7322b30d623dd084 Author: Jan Beulich AuthorDate: Mon Aug 31 13:51:52 2015 +0200 Commit: Jan Beulich CommitDate: Mon Aug 31 13:51:52 2015 +0200 x86/NUMA: fix setup_node() The function referenced an __initdata object (nodes_found). Since this being a node mask was more complicated than needed, the variable gets replaced by a simple counter. Check at once that the count of nodes doesn't go beyond MAX_NUMNODES. Also consolidate four printk()s related to the function's use into just one. Finally (quite the opposite of the above issue) __init-annotate nodes_cover_memory(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/arch/x86/srat.c | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 92c89a5..d6ce420 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -25,7 +25,6 @@ static struct acpi_table_slit *__read_mostly acpi_slit; static nodemask_t memory_nodes_parsed __initdata; static nodemask_t processor_nodes_parsed __initdata; -static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; struct pxm2node { @@ -61,11 +60,12 @@ nodeid_t pxm_to_node(unsigned pxm) return NUMA_NO_NODE; } -__devinit nodeid_t setup_node(unsigned pxm) +nodeid_t setup_node(unsigned pxm) { nodeid_t node; unsigned idx; static bool_t warned; + static unsigned nodes_found; BUILD_BUG_ON(MAX_NUMNODES >= NUMA_NO_NODE); @@ -85,15 +85,17 @@ __devinit nodeid_t setup_node(unsigned pxm) goto finish; if (!warned) { - printk(XENLOG_WARNING "More PXMs than available nodes\n"); + printk(KERN_WARNING "SRAT: Too many proximity domains (%#x)\n", + pxm); warned = 1; } return NUMA_NO_NODE; finish: - node = first_unset_node(nodes_found); - node_set(node, nodes_found); + node = nodes_found++; + if (node >= MAX_NUMNODES) + return NUMA_NO_NODE; pxm2node[idx].pxm = pxm; pxm2node[idx].node = node; @@ -219,7 +221,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) pxm = pa->proximity_domain; node = setup_node(pxm); if (node == NUMA_NO_NODE) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -254,7 +255,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) } node = setup_node(pxm); if (node == NUMA_NO_NODE) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -299,7 +299,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) pxm &= 0xff; node = setup_node(pxm); if (node == NUMA_NO_NODE) { - printk(KERN_ERR "SRAT: Too many proximity domains.\n"); bad_srat(); return; } @@ -341,7 +340,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) /* Sanity check to catch more bad SRATs (they are amazingly common). Make sure the PXMs cover all memory. */ -static int nodes_cover_memory(void) +static int __init nodes_cover_memory(void) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeH-0007Fw-4x; Wed, 09 Sep 2015 08:22:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeF-0007Fm-N6 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:32 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id DD/46-15765-64CEFE55; Wed, 09 Sep 2015 08:22:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1441786948!36676078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16589 invoked from network); 9 Sep 2015 08:22:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeB-0008St-K3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeA-000140-PI for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:26 +0000 Date: Wed, 09 Sep 2015 08:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NUMA: don't account hotplug 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 c011f470e6e79208f5baa071b4d072b78c88e2ba Author: Jan Beulich AuthorDate: Mon Aug 31 13:52:24 2015 +0200 Commit: Jan Beulich CommitDate: Mon Aug 31 13:52:24 2015 +0200 x86/NUMA: don't account hotplug regions ... except in cases where they really matter: node_memblk_range[] now is the only place all regions get stored. nodes[] and NODE_DATA() track present memory only. This improves the reporting when nodes have disjoint "normal" and hotplug regions, with the hotplug region sitting above the highest populated page. In such cases a node's spanned-pages value (visible in both XEN_SYSCTL_numainfo and 'u' debug key output) covered all the way up to top of populated memory, giving quite different a picture from what an otherwise identically configured system without and hotplug regions would report. Note, however, that the actual hotplug case (as well as cases of nodes with multiple disjoint present regions) is still not being handled such that the reported values would represent how much memory a node really has (but that can be considered intentional). Reported-by: Jim Fehlig This at once makes nodes_cover_memory() no longer consider E820_RAM regions covered by SRAT hotplug regions. Also reject self-overlaps with mismatching hotplug flags. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Jim Fehlig Release-acked-by: Wei Liu --- xen/arch/x86/srat.c | 55 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index d6ce420..4242d10 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -39,6 +39,7 @@ static unsigned node_to_pxm(nodeid_t n); static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static nodeid_t memblk_nodeid[NR_NODE_MEMBLKS]; +static __initdata DECLARE_BITMAP(memblk_hotplug, NR_NODE_MEMBLKS); static inline bool_t node_found(unsigned idx, unsigned pxm) { @@ -126,9 +127,9 @@ static __init int conflicting_memblks(u64 start, u64 end) if (nd->start == nd->end) continue; if (nd->end > start && nd->start < end) - return memblk_nodeid[i]; + return i; if (nd->end == end && nd->start == start) - return memblk_nodeid[i]; + return i; } return -1; } @@ -269,7 +270,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) void __init acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { - struct node *nd; u64 start, end; unsigned pxm; nodeid_t node; @@ -304,30 +304,40 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) } /* It is fine to add this area to the nodes data it will be used later*/ i = conflicting_memblks(start, end); - if (i == node) { - printk(KERN_WARNING - "SRAT: Warning: PXM %d (%"PRIx64"-%"PRIx64") overlaps with itself (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, nodes[i].start, nodes[i].end); - } else if (i >= 0) { + if (i < 0) + /* everything fine */; + else if (memblk_nodeid[i] == node) { + bool_t mismatch = !(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) != + !test_bit(i, memblk_hotplug); + + printk("%sSRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with itself (%"PRIx64"-%"PRIx64")\n", + mismatch ? KERN_ERR : KERN_WARNING, pxm, start, end, + node_memblk_range[i].start, node_memblk_range[i].end); + if (mismatch) { + bad_srat(); + return; + } + } else { printk(KERN_ERR - "SRAT: PXM %d (%"PRIx64"-%"PRIx64") overlaps with PXM %d (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, node_to_pxm(i), - nodes[i].start, nodes[i].end); + "SRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with PXM %u (%"PRIx64"-%"PRIx64")\n", + pxm, start, end, node_to_pxm(memblk_nodeid[i]), + node_memblk_range[i].start, node_memblk_range[i].end); bad_srat(); return; } - nd = &nodes[node]; - if (!node_test_and_set(node, memory_nodes_parsed)) { - nd->start = start; - nd->end = end; - } else { - if (start < nd->start) + if (!(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)) { + struct node *nd = &nodes[node]; + + if (!node_test_and_set(node, memory_nodes_parsed)) { nd->start = start; - if (nd->end < end) nd->end = end; + } else { + if (start < nd->start) + nd->start = start; + if (nd->end < end) + nd->end = end; + } } - if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && end > mem_hotplug) - mem_hotplug = end; printk(KERN_INFO "SRAT: Node %u PXM %u %"PRIx64"-%"PRIx64"%s\n", node, pxm, start, end, ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE ? " (hotplug)" : ""); @@ -335,6 +345,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) node_memblk_range[num_node_memblks].start = start; node_memblk_range[num_node_memblks].end = end; memblk_nodeid[num_node_memblks] = node; + if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) { + __set_bit(num_node_memblks, memblk_hotplug); + if (end > mem_hotplug) + mem_hotplug = end; + } num_node_memblks++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:22:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeH-0007Fw-4x; Wed, 09 Sep 2015 08:22:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeF-0007Fm-N6 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:32 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id DD/46-15765-64CEFE55; Wed, 09 Sep 2015 08:22:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1441786948!36676078!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16589 invoked from network); 9 Sep 2015 08:22:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeB-0008St-K3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeA-000140-PI for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:26 +0000 Date: Wed, 09 Sep 2015 08:22:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NUMA: don't account hotplug 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 c011f470e6e79208f5baa071b4d072b78c88e2ba Author: Jan Beulich AuthorDate: Mon Aug 31 13:52:24 2015 +0200 Commit: Jan Beulich CommitDate: Mon Aug 31 13:52:24 2015 +0200 x86/NUMA: don't account hotplug regions ... except in cases where they really matter: node_memblk_range[] now is the only place all regions get stored. nodes[] and NODE_DATA() track present memory only. This improves the reporting when nodes have disjoint "normal" and hotplug regions, with the hotplug region sitting above the highest populated page. In such cases a node's spanned-pages value (visible in both XEN_SYSCTL_numainfo and 'u' debug key output) covered all the way up to top of populated memory, giving quite different a picture from what an otherwise identically configured system without and hotplug regions would report. Note, however, that the actual hotplug case (as well as cases of nodes with multiple disjoint present regions) is still not being handled such that the reported values would represent how much memory a node really has (but that can be considered intentional). Reported-by: Jim Fehlig This at once makes nodes_cover_memory() no longer consider E820_RAM regions covered by SRAT hotplug regions. Also reject self-overlaps with mismatching hotplug flags. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Jim Fehlig Release-acked-by: Wei Liu --- xen/arch/x86/srat.c | 55 ++++++++++++++++++++++++++++++++------------------ 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index d6ce420..4242d10 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -39,6 +39,7 @@ static unsigned node_to_pxm(nodeid_t n); static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static nodeid_t memblk_nodeid[NR_NODE_MEMBLKS]; +static __initdata DECLARE_BITMAP(memblk_hotplug, NR_NODE_MEMBLKS); static inline bool_t node_found(unsigned idx, unsigned pxm) { @@ -126,9 +127,9 @@ static __init int conflicting_memblks(u64 start, u64 end) if (nd->start == nd->end) continue; if (nd->end > start && nd->start < end) - return memblk_nodeid[i]; + return i; if (nd->end == end && nd->start == start) - return memblk_nodeid[i]; + return i; } return -1; } @@ -269,7 +270,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) void __init acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { - struct node *nd; u64 start, end; unsigned pxm; nodeid_t node; @@ -304,30 +304,40 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) } /* It is fine to add this area to the nodes data it will be used later*/ i = conflicting_memblks(start, end); - if (i == node) { - printk(KERN_WARNING - "SRAT: Warning: PXM %d (%"PRIx64"-%"PRIx64") overlaps with itself (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, nodes[i].start, nodes[i].end); - } else if (i >= 0) { + if (i < 0) + /* everything fine */; + else if (memblk_nodeid[i] == node) { + bool_t mismatch = !(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) != + !test_bit(i, memblk_hotplug); + + printk("%sSRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with itself (%"PRIx64"-%"PRIx64")\n", + mismatch ? KERN_ERR : KERN_WARNING, pxm, start, end, + node_memblk_range[i].start, node_memblk_range[i].end); + if (mismatch) { + bad_srat(); + return; + } + } else { printk(KERN_ERR - "SRAT: PXM %d (%"PRIx64"-%"PRIx64") overlaps with PXM %d (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, node_to_pxm(i), - nodes[i].start, nodes[i].end); + "SRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with PXM %u (%"PRIx64"-%"PRIx64")\n", + pxm, start, end, node_to_pxm(memblk_nodeid[i]), + node_memblk_range[i].start, node_memblk_range[i].end); bad_srat(); return; } - nd = &nodes[node]; - if (!node_test_and_set(node, memory_nodes_parsed)) { - nd->start = start; - nd->end = end; - } else { - if (start < nd->start) + if (!(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)) { + struct node *nd = &nodes[node]; + + if (!node_test_and_set(node, memory_nodes_parsed)) { nd->start = start; - if (nd->end < end) nd->end = end; + } else { + if (start < nd->start) + nd->start = start; + if (nd->end < end) + nd->end = end; + } } - if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && end > mem_hotplug) - mem_hotplug = end; printk(KERN_INFO "SRAT: Node %u PXM %u %"PRIx64"-%"PRIx64"%s\n", node, pxm, start, end, ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE ? " (hotplug)" : ""); @@ -335,6 +345,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) node_memblk_range[num_node_memblks].start = start; node_memblk_range[num_node_memblks].end = end; memblk_nodeid[num_node_memblks] = node; + if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) { + __set_bit(num_node_memblks, memblk_hotplug); + if (end > mem_hotplug) + mem_hotplug = end; + } num_node_memblks++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:22:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeQ-0007Hm-9d; Wed, 09 Sep 2015 08:22:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeO-0007HT-JE for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:40 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 9A/81-01753-F4CEFE55; Wed, 09 Sep 2015 08:22:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1441786958!42670660!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3947 invoked from network); 9 Sep 2015 08:22:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeL-0008T1-Tj for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeL-00014o-S8 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:37 +0000 Date: Wed, 09 Sep 2015 08:22:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xc: add missing Py_DECREF() to fix a memory leak X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1ef21a5d1222c3b32d3d2314aafc16e948040f6 Author: Zhigang Wang AuthorDate: Fri Aug 28 17:35:18 2015 -0400 Commit: Ian Campbell CommitDate: Tue Sep 1 12:05:19 2015 +0100 python/xc: add missing Py_DECREF() to fix a memory leak Python PyList_Append() will increase reference count of the item. We have to decrease its reference count to let it garbage collected. We missed the Py_DECREF() for 'cpuinfo_obj' here, thus we have a memory leak. The memory leak could be easily confirmed by: # python >>> import xen.lowlevel.xc >>> xc = xen.lowlevel.xc.xc() >>> for i in range(1000): xc.getcpuinfo(1) And check the python process memory usage before and after: # ps f -o vsize,rss,%mem,size,cmd -p Signed-off-by: Zhigang Wang Acked-by: Wei Liu --- tools/python/xen/lowlevel/xc/xc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 2c36eb2..9a161d3 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1210,6 +1210,7 @@ static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) for (i = 0; i < nr_cpus; i++) { cpuinfo_obj = Py_BuildValue("{s:k}", "idletime", cpuinfo_ptr->idletime); PyList_Append(cpuinfo_list_obj, cpuinfo_obj); + Py_DECREF(cpuinfo_obj); cpuinfo_ptr++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:22:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeQ-0007Hm-9d; Wed, 09 Sep 2015 08:22:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeO-0007HT-JE for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:40 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 9A/81-01753-F4CEFE55; Wed, 09 Sep 2015 08:22:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1441786958!42670660!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3947 invoked from network); 9 Sep 2015 08:22:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeL-0008T1-Tj for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeL-00014o-S8 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:37 +0000 Date: Wed, 09 Sep 2015 08:22:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xc: add missing Py_DECREF() to fix a memory leak X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d1ef21a5d1222c3b32d3d2314aafc16e948040f6 Author: Zhigang Wang AuthorDate: Fri Aug 28 17:35:18 2015 -0400 Commit: Ian Campbell CommitDate: Tue Sep 1 12:05:19 2015 +0100 python/xc: add missing Py_DECREF() to fix a memory leak Python PyList_Append() will increase reference count of the item. We have to decrease its reference count to let it garbage collected. We missed the Py_DECREF() for 'cpuinfo_obj' here, thus we have a memory leak. The memory leak could be easily confirmed by: # python >>> import xen.lowlevel.xc >>> xc = xen.lowlevel.xc.xc() >>> for i in range(1000): xc.getcpuinfo(1) And check the python process memory usage before and after: # ps f -o vsize,rss,%mem,size,cmd -p Signed-off-by: Zhigang Wang Acked-by: Wei Liu --- tools/python/xen/lowlevel/xc/xc.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 2c36eb2..9a161d3 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1210,6 +1210,7 @@ static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) for (i = 0; i < nr_cpus; i++) { cpuinfo_obj = Py_BuildValue("{s:k}", "idletime", cpuinfo_ptr->idletime); PyList_Append(cpuinfo_list_obj, cpuinfo_obj); + Py_DECREF(cpuinfo_obj); cpuinfo_ptr++; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:22:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaea-0007JL-CH; Wed, 09 Sep 2015 08:22:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeY-0007J0-Fg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:50 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 92/79-03763-95CEFE55; Wed, 09 Sep 2015 08:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1441786968!41427973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16875 invoked from network); 9 Sep 2015 08:22:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeW-0008T9-45 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeW-00015A-1z for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:48 +0000 Date: Wed, 09 Sep 2015 08:22:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxenstore: prefer using the character device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c89dc95201ffed5fead17b35754bf9440fdbdc0 Author: Jonathan Creekmore AuthorDate: Thu Aug 27 09:04:38 2015 -0500 Commit: Ian Campbell CommitDate: Tue Sep 1 12:41:35 2015 +0100 libxenstore: prefer using the character device With the addition of FMODE_ATOMIC_POS in the Linux 3.14 kernel, concurrent blocking file accesses to a single open file descriptor can cause a deadlock trying to grab the file position lock. If a watch has been set up, causing a read_thread to blocking read on the file descriptor, then future writes that would cause the background read to complete will block waiting on the file position lock before they can execute. This race condition only occurs when libxenstore is accessing the xenstore daemon through the /proc/xen/xenbus file and not through the unix domain socket, which is the case when the xenstore daemon is running as a stub domain or when oxenstored is passed --disable-socket. Accessing the daemon from the true character device also does not exhibit this problem. On Linux, prefer using the character device file over the proc file if the character device exists. Signed-off-by: Jonathan Creekmore Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/xenstore/xs_lib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c index af4f75a..0c7744e 100644 --- a/tools/xenstore/xs_lib.c +++ b/tools/xenstore/xs_lib.c @@ -81,6 +81,8 @@ const char *xs_domain_dev(void) #if defined(__RUMPUSER_XEN__) || defined(__RUMPRUN__) return "/dev/xen/xenbus"; #elif defined(__linux__) + if (access("/dev/xen/xenbus", F_OK) == 0) + return "/dev/xen/xenbus"; return "/proc/xen/xenbus"; #elif defined(__NetBSD__) return "/kern/xen/xenbus"; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:22:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:22:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaea-0007JL-CH; Wed, 09 Sep 2015 08:22:52 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeY-0007J0-Fg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:50 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 92/79-03763-95CEFE55; Wed, 09 Sep 2015 08:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1441786968!41427973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16875 invoked from network); 9 Sep 2015 08:22:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeW-0008T9-45 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeW-00015A-1z for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:48 +0000 Date: Wed, 09 Sep 2015 08:22:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxenstore: prefer using the character device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9c89dc95201ffed5fead17b35754bf9440fdbdc0 Author: Jonathan Creekmore AuthorDate: Thu Aug 27 09:04:38 2015 -0500 Commit: Ian Campbell CommitDate: Tue Sep 1 12:41:35 2015 +0100 libxenstore: prefer using the character device With the addition of FMODE_ATOMIC_POS in the Linux 3.14 kernel, concurrent blocking file accesses to a single open file descriptor can cause a deadlock trying to grab the file position lock. If a watch has been set up, causing a read_thread to blocking read on the file descriptor, then future writes that would cause the background read to complete will block waiting on the file position lock before they can execute. This race condition only occurs when libxenstore is accessing the xenstore daemon through the /proc/xen/xenbus file and not through the unix domain socket, which is the case when the xenstore daemon is running as a stub domain or when oxenstored is passed --disable-socket. Accessing the daemon from the true character device also does not exhibit this problem. On Linux, prefer using the character device file over the proc file if the character device exists. Signed-off-by: Jonathan Creekmore Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/xenstore/xs_lib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/xenstore/xs_lib.c b/tools/xenstore/xs_lib.c index af4f75a..0c7744e 100644 --- a/tools/xenstore/xs_lib.c +++ b/tools/xenstore/xs_lib.c @@ -81,6 +81,8 @@ const char *xs_domain_dev(void) #if defined(__RUMPUSER_XEN__) || defined(__RUMPRUN__) return "/dev/xen/xenbus"; #elif defined(__linux__) + if (access("/dev/xen/xenbus", F_OK) == 0) + return "/dev/xen/xenbus"; return "/proc/xen/xenbus"; #elif defined(__NetBSD__) return "/kern/xen/xenbus"; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaek-0007LX-VO; Wed, 09 Sep 2015 08:23:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaej-0007L2-ET for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:01 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id D6/83-06021-46CEFE55; Wed, 09 Sep 2015 08:23:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1441786978!38278853!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24700 invoked from network); 9 Sep 2015 08:22:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeg-0008TH-9c for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeg-00016K-8i for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:58 +0000 Date: Wed, 09 Sep 2015 08:22:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NUMA: make init_node_heap() respect Xen heap limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88e3ed61642bb393458acc7a9bd2f96edc337190 Author: Jan Beulich AuthorDate: Tue Sep 1 14:02:57 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 1 14:02:57 2015 +0200 x86/NUMA: make init_node_heap() respect Xen heap limit On NUMA systems, where we try to use node local memory for the basic control structures of the buddy allocator, this special case needs to take into consideration a possible address width limit placed on the Xen heap. In turn this (but also other, more abstract considerations) requires that xenheap_max_mfn() not be called more than once (at most we might permit it to be called a second time with a larger value than was passed the first time), and be called only before calling end_boot_allocator(). While inspecting all the involved code, a couple of off-by-one issues were found (and are being corrected here at once): - arch_init_memory() cleared one too many page table slots - the highmem_start based invocation of xenheap_max_mfn() passed too big a value - xenheap_max_mfn() calculated the wrong bit count in edge cases Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Release-acked-by: Wei Liu --- xen/arch/x86/mm.c | 2 +- xen/arch/x86/setup.c | 11 +++++++---- xen/common/page_alloc.c | 24 ++++++++++++++++++------ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 358eb3a..202ff76 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -369,7 +369,7 @@ void __init arch_init_memory(void) for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; - for ( ; i <= L3_PAGETABLE_ENTRIES; ++i ) + for ( ; i < L3_PAGETABLE_ENTRIES; ++i ) l3tab[i] = l3e_empty(); split_l4e = l4e_from_pfn(virt_to_mfn(l3tab), __PAGE_HYPERVISOR); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index ff34670..3946e4c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1002,7 +1002,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) setup_max_pdx(raw_max_page); if ( highmem_start ) - xenheap_max_mfn(PFN_DOWN(highmem_start)); + xenheap_max_mfn(PFN_DOWN(highmem_start - 1)); /* * Walk every RAM region and map it in its entirety (on x86/64, at least) @@ -1183,9 +1183,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) numa_initmem_init(0, raw_max_page); - end_boot_allocator(); - system_state = SYS_STATE_boot; - if ( max_page - 1 > virt_to_mfn(HYPERVISOR_VIRT_END - 1) ) { unsigned long limit = virt_to_mfn(HYPERVISOR_VIRT_END - 1); @@ -1194,6 +1191,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( !highmem_start ) xenheap_max_mfn(limit); + end_boot_allocator(); + /* Pass the remaining memory to the allocator. */ for ( i = 0; i < boot_e820.nr_map; i++ ) { @@ -1217,6 +1216,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) opt_tmem = 0; } } + else + end_boot_allocator(); + + system_state = SYS_STATE_boot; vm_init(); console_init_ring(); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index e4417db..74fc1de 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -404,13 +404,19 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) spin_unlock(&heap_lock); } +static bool_t __read_mostly first_node_initialised; +#ifndef CONFIG_SEPARATE_XENHEAP +static unsigned int __read_mostly xenheap_bits; +#else +#define xenheap_bits 0 +#endif + static unsigned long init_node_heap(int node, unsigned long mfn, unsigned long nr, bool_t *use_tail) { /* First node to be discovered has its heap metadata statically alloced. */ static heap_by_zone_and_order_t _heap_static; static unsigned long avail_static[NR_ZONES]; - static int first_node_initialised; unsigned long needed = (sizeof(**_heap) + sizeof(**avail) * NR_ZONES + PAGE_SIZE - 1) >> PAGE_SHIFT; @@ -428,14 +434,18 @@ static unsigned long init_node_heap(int node, unsigned long mfn, } #ifdef DIRECTMAP_VIRT_END else if ( *use_tail && nr >= needed && - (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + nr - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn + nr - needed); avail[node] = mfn_to_virt(mfn + nr - 1) + PAGE_SIZE - sizeof(**avail) * NR_ZONES; } else if ( nr >= needed && - (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + needed - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn); avail[node] = mfn_to_virt(mfn + needed - 1) + @@ -1543,11 +1553,13 @@ void free_xenheap_pages(void *v, unsigned int order) #else -static unsigned int __read_mostly xenheap_bits; - void __init xenheap_max_mfn(unsigned long mfn) { - xenheap_bits = flsl(mfn) + PAGE_SHIFT; + ASSERT(!first_node_initialised); + ASSERT(!xenheap_bits); + BUILD_BUG_ON(PADDR_BITS >= BITS_PER_LONG); + xenheap_bits = min(flsl(mfn + 1) - 1 + PAGE_SHIFT, PADDR_BITS); + printk(XENLOG_INFO "Xen heap: %u bits\n", xenheap_bits); } void init_xenheap_pages(paddr_t ps, paddr_t pe) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaek-0007LX-VO; Wed, 09 Sep 2015 08:23:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaej-0007L2-ET for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:01 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id D6/83-06021-46CEFE55; Wed, 09 Sep 2015 08:23:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1441786978!38278853!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24700 invoked from network); 9 Sep 2015 08:22:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:22:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeg-0008TH-9c for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeg-00016K-8i for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:22:58 +0000 Date: Wed, 09 Sep 2015 08:22:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NUMA: make init_node_heap() respect Xen heap limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88e3ed61642bb393458acc7a9bd2f96edc337190 Author: Jan Beulich AuthorDate: Tue Sep 1 14:02:57 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 1 14:02:57 2015 +0200 x86/NUMA: make init_node_heap() respect Xen heap limit On NUMA systems, where we try to use node local memory for the basic control structures of the buddy allocator, this special case needs to take into consideration a possible address width limit placed on the Xen heap. In turn this (but also other, more abstract considerations) requires that xenheap_max_mfn() not be called more than once (at most we might permit it to be called a second time with a larger value than was passed the first time), and be called only before calling end_boot_allocator(). While inspecting all the involved code, a couple of off-by-one issues were found (and are being corrected here at once): - arch_init_memory() cleared one too many page table slots - the highmem_start based invocation of xenheap_max_mfn() passed too big a value - xenheap_max_mfn() calculated the wrong bit count in edge cases Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Release-acked-by: Wei Liu --- xen/arch/x86/mm.c | 2 +- xen/arch/x86/setup.c | 11 +++++++---- xen/common/page_alloc.c | 24 ++++++++++++++++++------ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 358eb3a..202ff76 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -369,7 +369,7 @@ void __init arch_init_memory(void) for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; - for ( ; i <= L3_PAGETABLE_ENTRIES; ++i ) + for ( ; i < L3_PAGETABLE_ENTRIES; ++i ) l3tab[i] = l3e_empty(); split_l4e = l4e_from_pfn(virt_to_mfn(l3tab), __PAGE_HYPERVISOR); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index ff34670..3946e4c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1002,7 +1002,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) setup_max_pdx(raw_max_page); if ( highmem_start ) - xenheap_max_mfn(PFN_DOWN(highmem_start)); + xenheap_max_mfn(PFN_DOWN(highmem_start - 1)); /* * Walk every RAM region and map it in its entirety (on x86/64, at least) @@ -1183,9 +1183,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) numa_initmem_init(0, raw_max_page); - end_boot_allocator(); - system_state = SYS_STATE_boot; - if ( max_page - 1 > virt_to_mfn(HYPERVISOR_VIRT_END - 1) ) { unsigned long limit = virt_to_mfn(HYPERVISOR_VIRT_END - 1); @@ -1194,6 +1191,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( !highmem_start ) xenheap_max_mfn(limit); + end_boot_allocator(); + /* Pass the remaining memory to the allocator. */ for ( i = 0; i < boot_e820.nr_map; i++ ) { @@ -1217,6 +1216,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) opt_tmem = 0; } } + else + end_boot_allocator(); + + system_state = SYS_STATE_boot; vm_init(); console_init_ring(); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index e4417db..74fc1de 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -404,13 +404,19 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) spin_unlock(&heap_lock); } +static bool_t __read_mostly first_node_initialised; +#ifndef CONFIG_SEPARATE_XENHEAP +static unsigned int __read_mostly xenheap_bits; +#else +#define xenheap_bits 0 +#endif + static unsigned long init_node_heap(int node, unsigned long mfn, unsigned long nr, bool_t *use_tail) { /* First node to be discovered has its heap metadata statically alloced. */ static heap_by_zone_and_order_t _heap_static; static unsigned long avail_static[NR_ZONES]; - static int first_node_initialised; unsigned long needed = (sizeof(**_heap) + sizeof(**avail) * NR_ZONES + PAGE_SIZE - 1) >> PAGE_SHIFT; @@ -428,14 +434,18 @@ static unsigned long init_node_heap(int node, unsigned long mfn, } #ifdef DIRECTMAP_VIRT_END else if ( *use_tail && nr >= needed && - (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + nr - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn + nr - needed); avail[node] = mfn_to_virt(mfn + nr - 1) + PAGE_SIZE - sizeof(**avail) * NR_ZONES; } else if ( nr >= needed && - (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + needed - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn); avail[node] = mfn_to_virt(mfn + needed - 1) + @@ -1543,11 +1553,13 @@ void free_xenheap_pages(void *v, unsigned int order) #else -static unsigned int __read_mostly xenheap_bits; - void __init xenheap_max_mfn(unsigned long mfn) { - xenheap_bits = flsl(mfn) + PAGE_SHIFT; + ASSERT(!first_node_initialised); + ASSERT(!xenheap_bits); + BUILD_BUG_ON(PADDR_BITS >= BITS_PER_LONG); + xenheap_bits = min(flsl(mfn + 1) - 1 + PAGE_SHIFT, PADDR_BITS); + printk(XENLOG_INFO "Xen heap: %u bits\n", xenheap_bits); } void init_xenheap_pages(paddr_t ps, paddr_t pe) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeu-0007Nw-1g; Wed, 09 Sep 2015 08:23:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaet-0007NY-0s for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:11 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 21/D3-06021-E6CEFE55; Wed, 09 Sep 2015 08:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1441786988!38278955!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27372 invoked from network); 9 Sep 2015 08:23: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; 9 Sep 2015 08:23:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeq-0008Tv-F2 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeq-00016s-E5 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:08 +0000 Date: Wed, 09 Sep 2015 08:23:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: make {set, clear}_identity_p2m_mapping() work for PV guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 619ecf8400cbc1540d9f07c317a8e2d6782c5752 Author: Jan Beulich AuthorDate: Tue Sep 1 16:51:44 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 1 16:51:44 2015 +0200 x86/mm: make {set,clear}_identity_p2m_mapping() work for PV guests Namely Dom0 suffers from commit 5ae03990c1 ("xen/vtd: create RMRR mapping") having removed the creation of such mappings for non- translated guests. Reported-by: Malcolm Crossley Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap Release-acked-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 8fa918b..b2726bd 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -957,7 +957,11 @@ int set_identity_p2m_entry(struct domain *d, unsigned long gfn, int ret; if ( !paging_mode_translate(p2m->domain) ) - return 0; + { + if ( !need_iommu(d) ) + return 0; + return iommu_map_page(d, gfn, gfn, IOMMUF_readable|IOMMUF_writable); + } gfn_lock(p2m, gfn, 0); @@ -1028,7 +1032,11 @@ int clear_identity_p2m_entry(struct domain *d, unsigned long gfn) int ret; if ( !paging_mode_translate(d) ) - return 0; + { + if ( !need_iommu(d) ) + return 0; + return iommu_unmap_page(d, gfn); + } gfn_lock(p2m, gfn, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeu-0007Nw-1g; Wed, 09 Sep 2015 08:23:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaet-0007NY-0s for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:11 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 21/D3-06021-E6CEFE55; Wed, 09 Sep 2015 08:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1441786988!38278955!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27372 invoked from network); 9 Sep 2015 08:23: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; 9 Sep 2015 08:23:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaeq-0008Tv-F2 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaeq-00016s-E5 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:08 +0000 Date: Wed, 09 Sep 2015 08:23:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: make {set, clear}_identity_p2m_mapping() work for PV guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 619ecf8400cbc1540d9f07c317a8e2d6782c5752 Author: Jan Beulich AuthorDate: Tue Sep 1 16:51:44 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 1 16:51:44 2015 +0200 x86/mm: make {set,clear}_identity_p2m_mapping() work for PV guests Namely Dom0 suffers from commit 5ae03990c1 ("xen/vtd: create RMRR mapping") having removed the creation of such mappings for non- translated guests. Reported-by: Malcolm Crossley Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap Release-acked-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 8fa918b..b2726bd 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -957,7 +957,11 @@ int set_identity_p2m_entry(struct domain *d, unsigned long gfn, int ret; if ( !paging_mode_translate(p2m->domain) ) - return 0; + { + if ( !need_iommu(d) ) + return 0; + return iommu_map_page(d, gfn, gfn, IOMMUF_readable|IOMMUF_writable); + } gfn_lock(p2m, gfn, 0); @@ -1028,7 +1032,11 @@ int clear_identity_p2m_entry(struct domain *d, unsigned long gfn) int ret; if ( !paging_mode_translate(d) ) - return 0; + { + if ( !need_iommu(d) ) + return 0; + return iommu_unmap_page(d, gfn); + } gfn_lock(p2m, gfn, 0); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23: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 1ZZaf5-0007Qc-4b; Wed, 09 Sep 2015 08:23:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaf4-0007QG-66 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:22 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id A7/CB-16618-87CEFE55; Wed, 09 Sep 2015 08:23:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1441786998!48077384!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21702 invoked from network); 9 Sep 2015 08:23:19 -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; 9 Sep 2015 08:23:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaf0-0008U3-JX for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaf0-00017H-If for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:18 +0000 Date: Wed, 09 Sep 2015 08:23:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION for rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8436576428994f2906ae74f4a03b79ccb40453f Author: Ian Jackson AuthorDate: Tue Sep 1 18:24:57 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 1 18:24:57 2015 +0100 Update QEMU_UPSTREAM_REVISION for rc3 As requested by Wei. --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index ca73ce3..59607b4 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc3 MINIOS_UPSTREAM_REVISION ?= b36bcb370d611ad7f41e8c21d061e6291e088c58 # Fri Jun 26 11:58:40 2015 +0100 # Correct printf formatting for tpm_tis message. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23: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 1ZZaf5-0007Qc-4b; Wed, 09 Sep 2015 08:23:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaf4-0007QG-66 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:22 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id A7/CB-16618-87CEFE55; Wed, 09 Sep 2015 08:23:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1441786998!48077384!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21702 invoked from network); 9 Sep 2015 08:23:19 -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; 9 Sep 2015 08:23:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaf0-0008U3-JX for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaf0-00017H-If for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:18 +0000 Date: Wed, 09 Sep 2015 08:23:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update QEMU_UPSTREAM_REVISION for rc3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8436576428994f2906ae74f4a03b79ccb40453f Author: Ian Jackson AuthorDate: Tue Sep 1 18:24:57 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 1 18:24:57 2015 +0100 Update QEMU_UPSTREAM_REVISION for rc3 As requested by Wei. --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index ca73ce3..59607b4 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc3 MINIOS_UPSTREAM_REVISION ?= b36bcb370d611ad7f41e8c21d061e6291e088c58 # Fri Jun 26 11:58:40 2015 +0100 # Correct printf formatting for tpm_tis message. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafF-0007Ss-7O; Wed, 09 Sep 2015 08:23:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafE-0007SX-3c for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:32 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 17/3D-29649-38CEFE55; Wed, 09 Sep 2015 08:23:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1441787009!42664803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18974 invoked from network); 9 Sep 2015 08:23:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:23:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafA-0008UF-R2 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafA-00017i-N3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:28 +0000 Date: Wed, 09 Sep 2015 08:23:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ocaml/xs: prefer using character device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d418eab3b6dbdeec84bf73af301dca54368547a Author: Doug Goldstein AuthorDate: Tue Sep 1 13:34:02 2015 -0500 Commit: Ian Campbell CommitDate: Wed Sep 2 12:05:41 2015 +0100 ocaml/xs: prefer using character device Since 9c89dc95201ffed5fead17b35754bf9440fdbdc0 libxenstore prefers using /dev/xen/xenbus over /proc/xen/xenbus. This makes the OCaml xenstore library contain the same preference. Signed-off-by: Doug Goldstein Acked-by: David Scott --- tools/ocaml/libs/xs/xs.ml | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xs/xs.ml b/tools/ocaml/libs/xs/xs.ml index 5757571..7e14487 100644 --- a/tools/ocaml/libs/xs/xs.ml +++ b/tools/ocaml/libs/xs/xs.ml @@ -162,7 +162,13 @@ let daemon_open () = with _ -> raise Failed_to_connect let domain_open () = - let path = "/proc/xen/xenbus" in + let path = try + let devpath = "/dev/xen/xenbus" in + Unix.access devpath [ Unix.F_OK ]; + devpath + with Unix.Unix_error(_, _, _) -> + "/proc/xen/xenbus" in + let fd = Unix.openfile path [ Unix.O_RDWR ] 0o550 in Unix.set_close_on_exec fd; make fd -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafF-0007Ss-7O; Wed, 09 Sep 2015 08:23:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafE-0007SX-3c for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:32 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 17/3D-29649-38CEFE55; Wed, 09 Sep 2015 08:23:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1441787009!42664803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18974 invoked from network); 9 Sep 2015 08:23:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:23:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafA-0008UF-R2 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafA-00017i-N3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:28 +0000 Date: Wed, 09 Sep 2015 08:23:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ocaml/xs: prefer using character device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d418eab3b6dbdeec84bf73af301dca54368547a Author: Doug Goldstein AuthorDate: Tue Sep 1 13:34:02 2015 -0500 Commit: Ian Campbell CommitDate: Wed Sep 2 12:05:41 2015 +0100 ocaml/xs: prefer using character device Since 9c89dc95201ffed5fead17b35754bf9440fdbdc0 libxenstore prefers using /dev/xen/xenbus over /proc/xen/xenbus. This makes the OCaml xenstore library contain the same preference. Signed-off-by: Doug Goldstein Acked-by: David Scott --- tools/ocaml/libs/xs/xs.ml | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/ocaml/libs/xs/xs.ml b/tools/ocaml/libs/xs/xs.ml index 5757571..7e14487 100644 --- a/tools/ocaml/libs/xs/xs.ml +++ b/tools/ocaml/libs/xs/xs.ml @@ -162,7 +162,13 @@ let daemon_open () = with _ -> raise Failed_to_connect let domain_open () = - let path = "/proc/xen/xenbus" in + let path = try + let devpath = "/dev/xen/xenbus" in + Unix.access devpath [ Unix.F_OK ]; + devpath + with Unix.Unix_error(_, _, _) -> + "/proc/xen/xenbus" in + let fd = Unix.openfile path [ Unix.O_RDWR ] 0o550 in Unix.set_close_on_exec fd; make fd -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafO-0007Uy-9q; Wed, 09 Sep 2015 08:23:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafN-0007Ug-GV for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:41 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 4E/10-09570-C8CEFE55; Wed, 09 Sep 2015 08:23:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1441787019!42552511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1955 invoked from network); 9 Sep 2015 08:23:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafL-0008UO-07 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafK-00018B-V9 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:38 +0000 Date: Wed, 09 Sep 2015 08:23:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: mm: Do not dump the p2m when mapping a foreign gfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afc13fe5e21d18c09e44f8ae6f7f4484e9f1de7f Author: Julien Grall AuthorDate: Thu Aug 13 12:03:43 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 12:23:50 2015 +0100 xen/arm: mm: Do not dump the p2m when mapping a foreign gfn The physmap operation XENMAPSPACE_gfmn_foreign is dumping the p2m when an error occured by calling dump_p2m_lookup. But this function is not using ratelimited printk. Any domain able to map foreign gfmn would be able to flood the Xen console. The information wasn't not useful so drop it. This is XSA-141. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index d6f64cc..b5d8c85 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1114,7 +1114,6 @@ int xenmem_add_to_physmap_one( page = get_page_from_gfn(od, idx, &p2mt, P2M_ALLOC); if ( !page ) { - dump_p2m_lookup(od, pfn_to_paddr(idx)); rcu_unlock_domain(od); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafO-0007Uy-9q; Wed, 09 Sep 2015 08:23:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafN-0007Ug-GV for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:41 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 4E/10-09570-C8CEFE55; Wed, 09 Sep 2015 08:23:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1441787019!42552511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1955 invoked from network); 9 Sep 2015 08:23:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:23:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafL-0008UO-07 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafK-00018B-V9 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:38 +0000 Date: Wed, 09 Sep 2015 08:23:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: mm: Do not dump the p2m when mapping a foreign gfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afc13fe5e21d18c09e44f8ae6f7f4484e9f1de7f Author: Julien Grall AuthorDate: Thu Aug 13 12:03:43 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 12:23:50 2015 +0100 xen/arm: mm: Do not dump the p2m when mapping a foreign gfn The physmap operation XENMAPSPACE_gfmn_foreign is dumping the p2m when an error occured by calling dump_p2m_lookup. But this function is not using ratelimited printk. Any domain able to map foreign gfmn would be able to flood the Xen console. The information wasn't not useful so drop it. This is XSA-141. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index d6f64cc..b5d8c85 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1114,7 +1114,6 @@ int xenmem_add_to_physmap_one( page = get_page_from_gfn(od, idx, &p2mt, P2M_ALLOC); if ( !page ) { - dump_p2m_lookup(od, pfn_to_paddr(idx)); rcu_unlock_domain(od); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafZ-0007XB-CR; Wed, 09 Sep 2015 08:23:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafY-0007Wq-3d for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:52 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 1F/2B-05269-79CEFE55; Wed, 09 Sep 2015 08:23:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1441787029!38279273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2797 invoked from network); 9 Sep 2015 08:23:50 -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; 9 Sep 2015 08:23:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafV-0008UY-77 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafV-000197-40 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:49 +0000 Date: Wed, 09 Sep 2015 08:23:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Honor Config.mk debug value, rather than setting our own X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16181cbb107ea70a72f41982b371c444926f48f2 Author: George Dunlap AuthorDate: Wed Sep 2 10:34:55 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 13:07:57 2015 +0100 tools: Honor Config.mk debug value, rather than setting our own Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add macro debugging information') exposed a bug whereby the autoconf stuff in tools was setting its own debug value (defaulting to ENABLED, even for releases) instead of honoring the value set in Config.mk. After that changeset, if the global build has -D_FORTIFY_SOURCE enabled (as is the default in CentOS 7 rpmbuild), then the tools build will fail (because debug builds default to on). There should be only one place to specify whether to build debug or not, and Config.mk is already included by the relevant makefiles. So simply remove the tools/configure debug option and everything falls into place naturally. Signed-off-by: George Dunlap Acked-by: Ian Campbell Acked-by: Wei Liu --- tools/configure | 26 -------------------------- tools/configure.ac | 1 - 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/tools/configure b/tools/configure index 428b3a5..884ce0a 100755 --- a/tools/configure +++ b/tools/configure @@ -707,7 +707,6 @@ rombios qemu_traditional blktap2 LINUX_BACKEND_MODULES -debug seabios ovmf xsmpolicy @@ -798,7 +797,6 @@ enable_ocamltools enable_xsmpolicy enable_ovmf enable_seabios -enable_debug with_linux_backend_modules enable_blktap2 enable_qemu_traditional @@ -1473,7 +1471,6 @@ Optional Features: --disable-xsmpolicy Disable XSM policy compilation (default is ENABLED) --enable-ovmf Enable OVMF (default is DISABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) - --disable-debug Disable debug build of tools (default is ENABLED) --enable-blktap2 Enable blktap2, (DEFAULT is on for Linux, otherwise off) --enable-qemu-traditional @@ -4114,29 +4111,6 @@ seabios=$ax_cv_seabios -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -fi - - -if test "x$enable_debug" = "xno"; then : - - ax_cv_debug="n" - -elif test "x$enable_debug" = "xyes"; then : - - ax_cv_debug="y" - -elif test -z $ax_cv_debug; then : - - ax_cv_debug="y" - -fi -debug=$ax_cv_debug - - - # Check whether --with-linux-backend-modules was given. if test "${with_linux_backend_modules+set}" = set; then : diff --git a/tools/configure.ac b/tools/configure.ac index 7daec99..6c70040 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -83,7 +83,6 @@ AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation]) AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) -AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AC_ARG_WITH([linux-backend-modules], AS_HELP_STRING([--with-linux-backend-modules="mod1 mod2"], -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:23:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:23:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafZ-0007XB-CR; Wed, 09 Sep 2015 08:23:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafY-0007Wq-3d for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:52 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 1F/2B-05269-79CEFE55; Wed, 09 Sep 2015 08:23:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1441787029!38279273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2797 invoked from network); 9 Sep 2015 08:23:50 -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; 9 Sep 2015 08:23:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafV-0008UY-77 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafV-000197-40 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:49 +0000 Date: Wed, 09 Sep 2015 08:23:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Honor Config.mk debug value, rather than setting our own X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16181cbb107ea70a72f41982b371c444926f48f2 Author: George Dunlap AuthorDate: Wed Sep 2 10:34:55 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 13:07:57 2015 +0100 tools: Honor Config.mk debug value, rather than setting our own Changeset 1166ecf ('tools/Rules.mk: Don't optimize debug builds; add macro debugging information') exposed a bug whereby the autoconf stuff in tools was setting its own debug value (defaulting to ENABLED, even for releases) instead of honoring the value set in Config.mk. After that changeset, if the global build has -D_FORTIFY_SOURCE enabled (as is the default in CentOS 7 rpmbuild), then the tools build will fail (because debug builds default to on). There should be only one place to specify whether to build debug or not, and Config.mk is already included by the relevant makefiles. So simply remove the tools/configure debug option and everything falls into place naturally. Signed-off-by: George Dunlap Acked-by: Ian Campbell Acked-by: Wei Liu --- tools/configure | 26 -------------------------- tools/configure.ac | 1 - 2 files changed, 0 insertions(+), 27 deletions(-) diff --git a/tools/configure b/tools/configure index 428b3a5..884ce0a 100755 --- a/tools/configure +++ b/tools/configure @@ -707,7 +707,6 @@ rombios qemu_traditional blktap2 LINUX_BACKEND_MODULES -debug seabios ovmf xsmpolicy @@ -798,7 +797,6 @@ enable_ocamltools enable_xsmpolicy enable_ovmf enable_seabios -enable_debug with_linux_backend_modules enable_blktap2 enable_qemu_traditional @@ -1473,7 +1471,6 @@ Optional Features: --disable-xsmpolicy Disable XSM policy compilation (default is ENABLED) --enable-ovmf Enable OVMF (default is DISABLED) --disable-seabios Disable SeaBIOS (default is ENABLED) - --disable-debug Disable debug build of tools (default is ENABLED) --enable-blktap2 Enable blktap2, (DEFAULT is on for Linux, otherwise off) --enable-qemu-traditional @@ -4114,29 +4111,6 @@ seabios=$ax_cv_seabios -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -fi - - -if test "x$enable_debug" = "xno"; then : - - ax_cv_debug="n" - -elif test "x$enable_debug" = "xyes"; then : - - ax_cv_debug="y" - -elif test -z $ax_cv_debug; then : - - ax_cv_debug="y" - -fi -debug=$ax_cv_debug - - - # Check whether --with-linux-backend-modules was given. if test "${with_linux_backend_modules+set}" = set; then : diff --git a/tools/configure.ac b/tools/configure.ac index 7daec99..6c70040 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -83,7 +83,6 @@ AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools]) AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation]) AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF]) AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS]) -AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools]) AC_ARG_WITH([linux-backend-modules], AS_HELP_STRING([--with-linux-backend-modules="mod1 mod2"], -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafj-0007ZK-H4; Wed, 09 Sep 2015 08:24:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafi-0007ZB-DS for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:02 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id E7/D5-32615-1ACEFE55; Wed, 09 Sep 2015 08:24:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1441787040!33783833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32305 invoked from network); 9 Sep 2015 08:24:00 -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; 9 Sep 2015 08:24:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaff-0008Ug-SD for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaff-0001Ar-PY for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:59 +0000 Date: Wed, 09 Sep 2015 08:23:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Don't crash/hang/leak hypervisor when using shared pools within an guest. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ec4b2f89e54d8bdfbeb5f4a4c2ec85d15819e8b Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 13:15:03 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:47:59 2015 -0400 tmem: Don't crash/hang/leak hypervisor when using shared pools within an guest. This is a regression introduced by a36590e1b5040838af19d2ca712a516f07a6062b "tmem: reorg the shared pool allocate path". When we are using shared pools we have an global array (on which we put the pool), and an array of pools per domain. We also have an shared list of clients (guests) _except_ for the very first domain that created the shared pool. To deal with multiple guests using an shared pool we have an ref count and a linked list. Whenever an new user of a the shared pool joins we increase the ref count and add to the linked list. Whenever an user quits the shared pool we decrement and remove from the linked list. Unfortunately this ref counting and linked list never worked properly. There are multiple issues: 1) If we have one shared pool (and only one guest creating it) - we do not add it to the shared list of clients. Which means the logic in 'shared_pool_quit' never removed the pool from global_shared_pools. That meant when the pool was de-allocated - we still had an pointer to the pool which would be accessed by tmemc_list_client (xl tmem-list -a) and hit a NULL page! 2). If we have two shared pools in a domain - it (shared_pool_quit) would remove the domain from the share_list linked list, decrements the refcount to zero - and remove the pool from the global shared pool. When done it would also clear the client->pools[] to NULL for itself. Which is good. However since there are two shared pools in the domain the next entry in the client->pools[] would have a stale pointer to the just de-allocated pool. Accessing it and trying to de-allocate it would lead to crashes or hypervisor hang - depending on the build. Fun times! To trigger this use http://xenbits.xen.org/gitweb/?p=xentesttools/bootstrap.git;a=blob;f=root_image/drivers/tmem_test/tmem_test.c This patch fixes it by making the very first domain that created an shared pool to follow the same logic as every domain that is joining a shared pool. That is increment the refcount and also add itself to the shared list of domains using it. We also remove an ASSERT that incorrectly assumed that only one shared pool would exist for a domain. And to mirror the reporting logic in shared_pool_join we also add a printk to advertise inter-domain shared pool joining. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/common/tmem.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f2dc26e..ed9b975 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1037,6 +1037,9 @@ static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) tmem_client_info("adding new %s %d to shared pool owned by %s %d\n", tmem_client_str, new_client->cli_id, tmem_client_str, pool->client->cli_id); + else if ( pool->shared_count ) + tmem_client_info("inter-guest sharing of shared pool %s by client %d\n", + tmem_client_str, pool->client->cli_id); ++pool->shared_count; return 0; } @@ -1056,7 +1059,10 @@ static void shared_pool_reassign(struct tmem_pool *pool) } old_client->pools[pool->pool_id] = NULL; sl = list_entry(pool->share_list.next, struct share_list, share_list); - ASSERT(sl->client != old_client); + /* + * The sl->client can be old_client if there are multiple shared pools + * within an guest. + */ pool->client = new_client = sl->client; for (poolid = 0; poolid < MAX_POOLS_PER_DOMAIN; poolid++) if (new_client->pools[poolid] == pool) @@ -1982,6 +1988,8 @@ static int do_tmem_new_pool(domid_t this_cli_id, { INIT_LIST_HEAD(&pool->share_list); pool->shared_count = 0; + if ( shared_pool_join(pool, client) ) + goto fail; global_shared_pools[first_unused_s_poolid] = pool; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafj-0007ZK-H4; Wed, 09 Sep 2015 08:24:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafi-0007ZB-DS for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:02 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id E7/D5-32615-1ACEFE55; Wed, 09 Sep 2015 08:24:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1441787040!33783833!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32305 invoked from network); 9 Sep 2015 08:24:00 -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; 9 Sep 2015 08:24:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaff-0008Ug-SD for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaff-0001Ar-PY for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:23:59 +0000 Date: Wed, 09 Sep 2015 08:23:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Don't crash/hang/leak hypervisor when using shared pools within an guest. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7ec4b2f89e54d8bdfbeb5f4a4c2ec85d15819e8b Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 13:15:03 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:47:59 2015 -0400 tmem: Don't crash/hang/leak hypervisor when using shared pools within an guest. This is a regression introduced by a36590e1b5040838af19d2ca712a516f07a6062b "tmem: reorg the shared pool allocate path". When we are using shared pools we have an global array (on which we put the pool), and an array of pools per domain. We also have an shared list of clients (guests) _except_ for the very first domain that created the shared pool. To deal with multiple guests using an shared pool we have an ref count and a linked list. Whenever an new user of a the shared pool joins we increase the ref count and add to the linked list. Whenever an user quits the shared pool we decrement and remove from the linked list. Unfortunately this ref counting and linked list never worked properly. There are multiple issues: 1) If we have one shared pool (and only one guest creating it) - we do not add it to the shared list of clients. Which means the logic in 'shared_pool_quit' never removed the pool from global_shared_pools. That meant when the pool was de-allocated - we still had an pointer to the pool which would be accessed by tmemc_list_client (xl tmem-list -a) and hit a NULL page! 2). If we have two shared pools in a domain - it (shared_pool_quit) would remove the domain from the share_list linked list, decrements the refcount to zero - and remove the pool from the global shared pool. When done it would also clear the client->pools[] to NULL for itself. Which is good. However since there are two shared pools in the domain the next entry in the client->pools[] would have a stale pointer to the just de-allocated pool. Accessing it and trying to de-allocate it would lead to crashes or hypervisor hang - depending on the build. Fun times! To trigger this use http://xenbits.xen.org/gitweb/?p=xentesttools/bootstrap.git;a=blob;f=root_image/drivers/tmem_test/tmem_test.c This patch fixes it by making the very first domain that created an shared pool to follow the same logic as every domain that is joining a shared pool. That is increment the refcount and also add itself to the shared list of domains using it. We also remove an ASSERT that incorrectly assumed that only one shared pool would exist for a domain. And to mirror the reporting logic in shared_pool_join we also add a printk to advertise inter-domain shared pool joining. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu --- xen/common/tmem.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index f2dc26e..ed9b975 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1037,6 +1037,9 @@ static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) tmem_client_info("adding new %s %d to shared pool owned by %s %d\n", tmem_client_str, new_client->cli_id, tmem_client_str, pool->client->cli_id); + else if ( pool->shared_count ) + tmem_client_info("inter-guest sharing of shared pool %s by client %d\n", + tmem_client_str, pool->client->cli_id); ++pool->shared_count; return 0; } @@ -1056,7 +1059,10 @@ static void shared_pool_reassign(struct tmem_pool *pool) } old_client->pools[pool->pool_id] = NULL; sl = list_entry(pool->share_list.next, struct share_list, share_list); - ASSERT(sl->client != old_client); + /* + * The sl->client can be old_client if there are multiple shared pools + * within an guest. + */ pool->client = new_client = sl->client; for (poolid = 0; poolid < MAX_POOLS_PER_DOMAIN; poolid++) if (new_client->pools[poolid] == pool) @@ -1982,6 +1988,8 @@ static int do_tmem_new_pool(domid_t this_cli_id, { INIT_LIST_HEAD(&pool->share_list); pool->shared_count = 0; + if ( shared_pool_join(pool, client) ) + goto fail; global_shared_pools[first_unused_s_poolid] = pool; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24: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 1ZZaft-0007aj-Ji; Wed, 09 Sep 2015 08:24:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafs-0007ab-Iy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:12 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 84/1F-26043-BACEFE55; Wed, 09 Sep 2015 08:24:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1441787050!48085907!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9670 invoked from network); 9 Sep 2015 08:24:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafq-0008VH-13 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafq-0001BT-09 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:10 +0000 Date: Wed, 09 Sep 2015 08:24:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Add ASSERT in obj_rb_insert for pool->rwlock lock. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7646da32f6a863b4c9c7ec9a7226bf675921622e Author: Konrad Rzeszutek Wilk AuthorDate: Fri Aug 21 10:49:22 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:47:59 2015 -0400 tmem: Add ASSERT in obj_rb_insert for pool->rwlock lock. Manipulating the obj-> structures requires us to hold the pool->rwlock lock. Lets make that obvious in this function to catch any errant users (none found, but we may in future). Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- xen/common/tmem.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index ed9b975..6ea602b 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -916,6 +916,9 @@ static int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) struct rb_node **new, *parent = NULL; struct tmem_object_root *this; + ASSERT(obj->pool); + ASSERT_WRITELOCK(&obj->pool->pool_rwlock); + new = &(root->rb_node); while ( *new ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24: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 1ZZaft-0007aj-Ji; Wed, 09 Sep 2015 08:24:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafs-0007ab-Iy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:12 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 84/1F-26043-BACEFE55; Wed, 09 Sep 2015 08:24:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1441787050!48085907!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9670 invoked from network); 9 Sep 2015 08:24:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZafq-0008VH-13 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZafq-0001BT-09 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:10 +0000 Date: Wed, 09 Sep 2015 08:24:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Add ASSERT in obj_rb_insert for pool->rwlock lock. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7646da32f6a863b4c9c7ec9a7226bf675921622e Author: Konrad Rzeszutek Wilk AuthorDate: Fri Aug 21 10:49:22 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:47:59 2015 -0400 tmem: Add ASSERT in obj_rb_insert for pool->rwlock lock. Manipulating the obj-> structures requires us to hold the pool->rwlock lock. Lets make that obvious in this function to catch any errant users (none found, but we may in future). Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- xen/common/tmem.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index ed9b975..6ea602b 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -916,6 +916,9 @@ static int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) struct rb_node **new, *parent = NULL; struct tmem_object_root *this; + ASSERT(obj->pool); + ASSERT_WRITELOCK(&obj->pool->pool_rwlock); + new = &(root->rb_node); while ( *new ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZag3-0007cK-M9; Wed, 09 Sep 2015 08:24:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZag2-0007cA-HR for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:22 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 0D/57-06021-5BCEFE55; Wed, 09 Sep 2015 08:24:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1441787060!42671439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22717 invoked from network); 9 Sep 2015 08:24:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZag0-0008VP-5H for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZag0-0001Bq-4Q for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:20 +0000 Date: Wed, 09 Sep 2015 08:24:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove in xc_tmem_control_oid duplicate set_xen_guest_handle 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 1682d2fdf6bcfb0f475c1720dad7a8215eb1ac79 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 17:41:34 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:47:59 2015 -0400 tmem: Remove in xc_tmem_control_oid duplicate set_xen_guest_handle call We are doing another call to set_xen_guest_handle right after the xc_hypercall_bounce_pre (the correct place to do it). Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/libxc/xc_tmem.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 8352233..0d1bfb4 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -110,7 +110,6 @@ int xc_tmem_control_oid(xc_interface *xch, op.pool_id = pool_id; op.u.ctrl.subop = subop; op.u.ctrl.cli_id = cli_id; - set_xen_guest_handle(op.u.ctrl.buf,buf); op.u.ctrl.arg1 = arg1; op.u.ctrl.arg2 = arg2; op.u.ctrl.oid[0] = oid.oid[0]; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZag3-0007cK-M9; Wed, 09 Sep 2015 08:24:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZag2-0007cA-HR for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:22 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 0D/57-06021-5BCEFE55; Wed, 09 Sep 2015 08:24:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1441787060!42671439!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22717 invoked from network); 9 Sep 2015 08:24:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZag0-0008VP-5H for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZag0-0001Bq-4Q for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:20 +0000 Date: Wed, 09 Sep 2015 08:24:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove in xc_tmem_control_oid duplicate set_xen_guest_handle 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 1682d2fdf6bcfb0f475c1720dad7a8215eb1ac79 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 17:41:34 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:47:59 2015 -0400 tmem: Remove in xc_tmem_control_oid duplicate set_xen_guest_handle call We are doing another call to set_xen_guest_handle right after the xc_hypercall_bounce_pre (the correct place to do it). Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/libxc/xc_tmem.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 8352233..0d1bfb4 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -110,7 +110,6 @@ int xc_tmem_control_oid(xc_interface *xch, op.pool_id = pool_id; op.u.ctrl.subop = subop; op.u.ctrl.cli_id = cli_id; - set_xen_guest_handle(op.u.ctrl.buf,buf); op.u.ctrl.arg1 = arg1; op.u.ctrl.arg2 = arg2; op.u.ctrl.oid[0] = oid.oid[0]; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagG-0007eO-Ol; Wed, 09 Sep 2015 08:24:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagF-0007e8-0u for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:35 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 03/75-18886-1CCEFE55; Wed, 09 Sep 2015 08:24:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1441787070!48086040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13151 invoked from network); 9 Sep 2015 08:24:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagA-0008VX-F3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagA-0001CD-9k for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:30 +0000 Date: Wed, 09 Sep 2015 08:24:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove xc_tmem_control mystical arg3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54a51b1766fd433b95e63834eb15d4b1f70271de Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 17:43:31 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Remove xc_tmem_control mystical arg3 It mentions it but it is never used. The hypercall interface knows nothing of this sort of thing either. Lets just remove it. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu [release + toolstack] Reviewed-by: Andrew Cooper --- tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_tmem.c | 38 +++++++++++++++---------------- tools/libxl/libxl.c | 10 ++++---- tools/python/xen/lowlevel/xc/xc.c | 7 ++--- tools/xenstat/libxenstat/src/xenstat.c | 4 +- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index de3c0ad..9e34769 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2304,7 +2304,7 @@ int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, uint32_t subop, struct tmem_oid oid, void *buf); int xc_tmem_control(xc_interface *xch, int32_t pool_id, uint32_t subop, uint32_t cli_id, - uint32_t arg1, uint32_t arg2, uint64_t arg3, void *buf); + uint32_t arg1, uint32_t arg2, void *buf); int xc_tmem_auth(xc_interface *xch, int cli_id, char *uuid_str, int arg1); int xc_tmem_save(xc_interface *xch, int dom, int live, int fd, int field_marker); int xc_tmem_save_extra(xc_interface *xch, int dom, int fd, int field_marker); diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 0d1bfb4..467001b 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -51,7 +51,6 @@ int xc_tmem_control(xc_interface *xch, uint32_t cli_id, uint32_t arg1, uint32_t arg2, - uint64_t arg3, void *buf) { tmem_op_t op; @@ -64,7 +63,6 @@ int xc_tmem_control(xc_interface *xch, op.u.ctrl.cli_id = cli_id; op.u.ctrl.arg1 = arg1; op.u.ctrl.arg2 = arg2; - /* use xc_tmem_control_oid if arg3 is required */ op.u.ctrl.oid[0] = 0; op.u.ctrl.oid[1] = 0; op.u.ctrl.oid[2] = 0; @@ -220,28 +218,28 @@ int xc_tmem_save(xc_interface *xch, uint32_t minusone = -1; struct tmem_handle *h; - if ( xc_tmem_control(xch,0,TMEMC_SAVE_BEGIN,dom,live,0,0,NULL) <= 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SAVE_BEGIN,dom,live,0,NULL) <= 0 ) return 0; if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; - version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,0,0,0,0,NULL); + version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,0,0,0,NULL); if ( write_exact(io_fd, &version, sizeof(version)) ) return -1; - max_pools = xc_tmem_control(xch,0,TMEMC_SAVE_GET_MAXPOOLS,0,0,0,0,NULL); + max_pools = xc_tmem_control(xch,0,TMEMC_SAVE_GET_MAXPOOLS,0,0,0,NULL); if ( write_exact(io_fd, &max_pools, sizeof(max_pools)) ) return -1; if ( version == -1 || max_pools == -1 ) return -1; if ( write_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; - flags = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_FLAGS,dom,0,0,0,NULL); + flags = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_FLAGS,dom,0,0,NULL); if ( write_exact(io_fd, &flags, sizeof(flags)) ) return -1; - weight = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_WEIGHT,dom,0,0,0,NULL); + weight = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_WEIGHT,dom,0,0,NULL); if ( write_exact(io_fd, &weight, sizeof(weight)) ) return -1; - cap = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_CAP,dom,0,0,0,NULL); + cap = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_CAP,dom,0,0,NULL); if ( write_exact(io_fd, &cap, sizeof(cap)) ) return -1; if ( flags == -1 || weight == -1 || cap == -1 ) @@ -258,14 +256,14 @@ int xc_tmem_save(xc_interface *xch, int checksum = 0; /* get pool id, flags, pagesize, n_pages, uuid */ - flags = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_FLAGS,dom,0,0,0,NULL); + flags = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_FLAGS,dom,0,0,NULL); if ( flags != -1 ) { pool_id = i; - n_pages = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_NPAGES,dom,0,0,0,NULL); + n_pages = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_NPAGES,dom,0,0,NULL); if ( !(flags & TMEM_POOL_PERSIST) ) n_pages = 0; - (void)xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,0,&uuid); + (void)xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,&uuid); if ( write_exact(io_fd, &pool_id, sizeof(pool_id)) ) return -1; if ( write_exact(io_fd, &flags, sizeof(flags)) ) @@ -290,7 +288,7 @@ int xc_tmem_save(xc_interface *xch, int ret; if ( (ret = xc_tmem_control(xch, pool_id, TMEMC_SAVE_GET_NEXT_PAGE, dom, - bufsize, 0, 0, buf)) > 0 ) + bufsize, 0, buf)) > 0 ) { h = (struct tmem_handle *)buf; if ( write_exact(io_fd, &h->oid, sizeof(h->oid)) ) @@ -335,7 +333,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; while ( xc_tmem_control(xch, 0, TMEMC_SAVE_GET_NEXT_INV, dom, - sizeof(handle),0,0,&handle) > 0 ) { + sizeof(handle),0,&handle) > 0 ) { if ( write_exact(io_fd, &handle.pool_id, sizeof(handle.pool_id)) ) return -1; if ( write_exact(io_fd, &handle.oid, sizeof(handle.oid)) ) @@ -357,7 +355,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) /* only called for live migration */ void xc_tmem_save_done(xc_interface *xch, int dom) { - xc_tmem_control(xch,0,TMEMC_SAVE_END,dom,0,0,0,NULL); + xc_tmem_control(xch,0,TMEMC_SAVE_END,dom,0,0,NULL); } /* restore routines */ @@ -391,7 +389,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) uint32_t weight, cap, flags; int checksum = 0; - save_version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,dom,0,0,0,NULL); + save_version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,dom,0,0,NULL); if ( save_version == -1 ) return -1; /* domain doesn't exist */ if ( read_exact(io_fd, &this_version, sizeof(this_version)) ) @@ -403,23 +401,23 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) return -1; if ( minusone != -1 ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_RESTORE_BEGIN,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_RESTORE_BEGIN,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &flags, sizeof(flags)) ) return -1; if ( flags & TMEM_CLIENT_COMPRESS ) - if ( xc_tmem_control(xch,0,TMEMC_SET_COMPRESS,dom,1,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SET_COMPRESS,dom,1,0,NULL) < 0 ) return -1; if ( flags & TMEM_CLIENT_FROZEN ) - if ( xc_tmem_control(xch,0,TMEMC_FREEZE,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_FREEZE,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &weight, sizeof(weight)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_WEIGHT,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SET_WEIGHT,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &cap, sizeof(cap)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_CAP,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SET_CAP,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4f2eb24..e564c22 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6046,7 +6046,7 @@ char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long) char _buf[32768]; rc = xc_tmem_control(ctx->xch, -1, TMEMC_LIST, domid, 32768, use_long, - 0, _buf); + _buf); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not get tmem list"); @@ -6061,7 +6061,7 @@ int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid) int rc; rc = xc_tmem_control(ctx->xch, -1, TMEMC_FREEZE, domid, 0, 0, - 0, NULL); + NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not freeze tmem pools"); @@ -6076,7 +6076,7 @@ int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) int rc; rc = xc_tmem_control(ctx->xch, -1, TMEMC_THAW, domid, 0, 0, - 0, NULL); + NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not thaw tmem pools"); @@ -6108,7 +6108,7 @@ int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set) "Invalid set, valid sets are "); return ERROR_INVAL; } - rc = xc_tmem_control(ctx->xch, -1, subop, domid, set, 0, 0, NULL); + rc = xc_tmem_control(ctx->xch, -1, subop, domid, set, 0, NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not set tmem %s", name); @@ -6137,7 +6137,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0, 0); + rc = xc_tmem_control(ctx->xch, -1, TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not get tmem freeable memory"); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 9a161d3..024014f 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1799,21 +1799,20 @@ static PyObject *pyxc_tmem_control(XcObject *self, uint32_t cli_id; uint32_t arg1; uint32_t arg2; - uint64_t arg3; char *buf; char _buffer[32768], *buffer = _buffer; int rc; - static char *kwd_list[] = { "pool_id", "subop", "cli_id", "arg1", "arg2", "arg3", "buf", NULL }; + static char *kwd_list[] = { "pool_id", "subop", "cli_id", "arg1", "arg2", "buf", NULL }; if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiiiis", kwd_list, - &pool_id, &subop, &cli_id, &arg1, &arg2, &arg3, &buf) ) + &pool_id, &subop, &cli_id, &arg1, &arg2, &buf) ) return NULL; if ( (subop == TMEMC_LIST) && (arg1 > 32768) ) arg1 = 32768; - if ( (rc = xc_tmem_control(self->xc_handle, pool_id, subop, cli_id, arg1, arg2, arg3, buffer)) < 0 ) + if ( (rc = xc_tmem_control(self->xc_handle, pool_id, subop, cli_id, arg1, arg2, buffer)) < 0 ) return Py_BuildValue("i", rc); switch (subop) { diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c index dfffbbc..24b57d0 100644 --- a/tools/xenstat/libxenstat/src/xenstat.c +++ b/tools/xenstat/libxenstat/src/xenstat.c @@ -150,7 +150,7 @@ void domain_get_tmem_stats(xenstat_handle * handle, xenstat_domain * domain) char buffer[4096]; if (xc_tmem_control(handle->xc_handle,-1,TMEMC_LIST,domain->id, - sizeof(buffer),-1,-1,buffer) < 0) + sizeof(buffer),-1,buffer) < 0) return; domain->tmem_stats.curr_eph_pages = parse(buffer,"Ec"); domain->tmem_stats.succ_eph_gets = parse(buffer,"Ge"); @@ -191,7 +191,7 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) * handle->page_size; rc = xc_tmem_control(handle->xc_handle, -1, - TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0, NULL); + TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, NULL); node->freeable_mb = (rc < 0) ? 0 : rc; /* malloc(0) is not portable, so allocate a single domain. This will * be resized below. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagG-0007eO-Ol; Wed, 09 Sep 2015 08:24:36 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagF-0007e8-0u for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:35 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 03/75-18886-1CCEFE55; Wed, 09 Sep 2015 08:24:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1441787070!48086040!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13151 invoked from network); 9 Sep 2015 08:24:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagA-0008VX-F3 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagA-0001CD-9k for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:30 +0000 Date: Wed, 09 Sep 2015 08:24:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove xc_tmem_control mystical arg3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54a51b1766fd433b95e63834eb15d4b1f70271de Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 17:43:31 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Remove xc_tmem_control mystical arg3 It mentions it but it is never used. The hypercall interface knows nothing of this sort of thing either. Lets just remove it. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu [release + toolstack] Reviewed-by: Andrew Cooper --- tools/libxc/include/xenctrl.h | 2 +- tools/libxc/xc_tmem.c | 38 +++++++++++++++---------------- tools/libxl/libxl.c | 10 ++++---- tools/python/xen/lowlevel/xc/xc.c | 7 ++--- tools/xenstat/libxenstat/src/xenstat.c | 4 +- 5 files changed, 29 insertions(+), 32 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index de3c0ad..9e34769 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2304,7 +2304,7 @@ int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, uint32_t subop, struct tmem_oid oid, void *buf); int xc_tmem_control(xc_interface *xch, int32_t pool_id, uint32_t subop, uint32_t cli_id, - uint32_t arg1, uint32_t arg2, uint64_t arg3, void *buf); + uint32_t arg1, uint32_t arg2, void *buf); int xc_tmem_auth(xc_interface *xch, int cli_id, char *uuid_str, int arg1); int xc_tmem_save(xc_interface *xch, int dom, int live, int fd, int field_marker); int xc_tmem_save_extra(xc_interface *xch, int dom, int fd, int field_marker); diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 0d1bfb4..467001b 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -51,7 +51,6 @@ int xc_tmem_control(xc_interface *xch, uint32_t cli_id, uint32_t arg1, uint32_t arg2, - uint64_t arg3, void *buf) { tmem_op_t op; @@ -64,7 +63,6 @@ int xc_tmem_control(xc_interface *xch, op.u.ctrl.cli_id = cli_id; op.u.ctrl.arg1 = arg1; op.u.ctrl.arg2 = arg2; - /* use xc_tmem_control_oid if arg3 is required */ op.u.ctrl.oid[0] = 0; op.u.ctrl.oid[1] = 0; op.u.ctrl.oid[2] = 0; @@ -220,28 +218,28 @@ int xc_tmem_save(xc_interface *xch, uint32_t minusone = -1; struct tmem_handle *h; - if ( xc_tmem_control(xch,0,TMEMC_SAVE_BEGIN,dom,live,0,0,NULL) <= 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SAVE_BEGIN,dom,live,0,NULL) <= 0 ) return 0; if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; - version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,0,0,0,0,NULL); + version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,0,0,0,NULL); if ( write_exact(io_fd, &version, sizeof(version)) ) return -1; - max_pools = xc_tmem_control(xch,0,TMEMC_SAVE_GET_MAXPOOLS,0,0,0,0,NULL); + max_pools = xc_tmem_control(xch,0,TMEMC_SAVE_GET_MAXPOOLS,0,0,0,NULL); if ( write_exact(io_fd, &max_pools, sizeof(max_pools)) ) return -1; if ( version == -1 || max_pools == -1 ) return -1; if ( write_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; - flags = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_FLAGS,dom,0,0,0,NULL); + flags = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_FLAGS,dom,0,0,NULL); if ( write_exact(io_fd, &flags, sizeof(flags)) ) return -1; - weight = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_WEIGHT,dom,0,0,0,NULL); + weight = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_WEIGHT,dom,0,0,NULL); if ( write_exact(io_fd, &weight, sizeof(weight)) ) return -1; - cap = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_CAP,dom,0,0,0,NULL); + cap = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_CAP,dom,0,0,NULL); if ( write_exact(io_fd, &cap, sizeof(cap)) ) return -1; if ( flags == -1 || weight == -1 || cap == -1 ) @@ -258,14 +256,14 @@ int xc_tmem_save(xc_interface *xch, int checksum = 0; /* get pool id, flags, pagesize, n_pages, uuid */ - flags = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_FLAGS,dom,0,0,0,NULL); + flags = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_FLAGS,dom,0,0,NULL); if ( flags != -1 ) { pool_id = i; - n_pages = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_NPAGES,dom,0,0,0,NULL); + n_pages = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_NPAGES,dom,0,0,NULL); if ( !(flags & TMEM_POOL_PERSIST) ) n_pages = 0; - (void)xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,0,&uuid); + (void)xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,&uuid); if ( write_exact(io_fd, &pool_id, sizeof(pool_id)) ) return -1; if ( write_exact(io_fd, &flags, sizeof(flags)) ) @@ -290,7 +288,7 @@ int xc_tmem_save(xc_interface *xch, int ret; if ( (ret = xc_tmem_control(xch, pool_id, TMEMC_SAVE_GET_NEXT_PAGE, dom, - bufsize, 0, 0, buf)) > 0 ) + bufsize, 0, buf)) > 0 ) { h = (struct tmem_handle *)buf; if ( write_exact(io_fd, &h->oid, sizeof(h->oid)) ) @@ -335,7 +333,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; while ( xc_tmem_control(xch, 0, TMEMC_SAVE_GET_NEXT_INV, dom, - sizeof(handle),0,0,&handle) > 0 ) { + sizeof(handle),0,&handle) > 0 ) { if ( write_exact(io_fd, &handle.pool_id, sizeof(handle.pool_id)) ) return -1; if ( write_exact(io_fd, &handle.oid, sizeof(handle.oid)) ) @@ -357,7 +355,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) /* only called for live migration */ void xc_tmem_save_done(xc_interface *xch, int dom) { - xc_tmem_control(xch,0,TMEMC_SAVE_END,dom,0,0,0,NULL); + xc_tmem_control(xch,0,TMEMC_SAVE_END,dom,0,0,NULL); } /* restore routines */ @@ -391,7 +389,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) uint32_t weight, cap, flags; int checksum = 0; - save_version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,dom,0,0,0,NULL); + save_version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,dom,0,0,NULL); if ( save_version == -1 ) return -1; /* domain doesn't exist */ if ( read_exact(io_fd, &this_version, sizeof(this_version)) ) @@ -403,23 +401,23 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) return -1; if ( minusone != -1 ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_RESTORE_BEGIN,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_RESTORE_BEGIN,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &flags, sizeof(flags)) ) return -1; if ( flags & TMEM_CLIENT_COMPRESS ) - if ( xc_tmem_control(xch,0,TMEMC_SET_COMPRESS,dom,1,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SET_COMPRESS,dom,1,0,NULL) < 0 ) return -1; if ( flags & TMEM_CLIENT_FROZEN ) - if ( xc_tmem_control(xch,0,TMEMC_FREEZE,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_FREEZE,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &weight, sizeof(weight)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_WEIGHT,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SET_WEIGHT,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &cap, sizeof(cap)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_CAP,dom,0,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,TMEMC_SET_CAP,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4f2eb24..e564c22 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6046,7 +6046,7 @@ char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long) char _buf[32768]; rc = xc_tmem_control(ctx->xch, -1, TMEMC_LIST, domid, 32768, use_long, - 0, _buf); + _buf); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not get tmem list"); @@ -6061,7 +6061,7 @@ int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid) int rc; rc = xc_tmem_control(ctx->xch, -1, TMEMC_FREEZE, domid, 0, 0, - 0, NULL); + NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not freeze tmem pools"); @@ -6076,7 +6076,7 @@ int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) int rc; rc = xc_tmem_control(ctx->xch, -1, TMEMC_THAW, domid, 0, 0, - 0, NULL); + NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not thaw tmem pools"); @@ -6108,7 +6108,7 @@ int libxl_tmem_set(libxl_ctx *ctx, uint32_t domid, char* name, uint32_t set) "Invalid set, valid sets are "); return ERROR_INVAL; } - rc = xc_tmem_control(ctx->xch, -1, subop, domid, set, 0, 0, NULL); + rc = xc_tmem_control(ctx->xch, -1, subop, domid, set, 0, NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not set tmem %s", name); @@ -6137,7 +6137,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0, 0); + rc = xc_tmem_control(ctx->xch, -1, TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not get tmem freeable memory"); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 9a161d3..024014f 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1799,21 +1799,20 @@ static PyObject *pyxc_tmem_control(XcObject *self, uint32_t cli_id; uint32_t arg1; uint32_t arg2; - uint64_t arg3; char *buf; char _buffer[32768], *buffer = _buffer; int rc; - static char *kwd_list[] = { "pool_id", "subop", "cli_id", "arg1", "arg2", "arg3", "buf", NULL }; + static char *kwd_list[] = { "pool_id", "subop", "cli_id", "arg1", "arg2", "buf", NULL }; if ( !PyArg_ParseTupleAndKeywords(args, kwds, "iiiiiis", kwd_list, - &pool_id, &subop, &cli_id, &arg1, &arg2, &arg3, &buf) ) + &pool_id, &subop, &cli_id, &arg1, &arg2, &buf) ) return NULL; if ( (subop == TMEMC_LIST) && (arg1 > 32768) ) arg1 = 32768; - if ( (rc = xc_tmem_control(self->xc_handle, pool_id, subop, cli_id, arg1, arg2, arg3, buffer)) < 0 ) + if ( (rc = xc_tmem_control(self->xc_handle, pool_id, subop, cli_id, arg1, arg2, buffer)) < 0 ) return Py_BuildValue("i", rc); switch (subop) { diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c index dfffbbc..24b57d0 100644 --- a/tools/xenstat/libxenstat/src/xenstat.c +++ b/tools/xenstat/libxenstat/src/xenstat.c @@ -150,7 +150,7 @@ void domain_get_tmem_stats(xenstat_handle * handle, xenstat_domain * domain) char buffer[4096]; if (xc_tmem_control(handle->xc_handle,-1,TMEMC_LIST,domain->id, - sizeof(buffer),-1,-1,buffer) < 0) + sizeof(buffer),-1,buffer) < 0) return; domain->tmem_stats.curr_eph_pages = parse(buffer,"Ec"); domain->tmem_stats.succ_eph_gets = parse(buffer,"Ge"); @@ -191,7 +191,7 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) * handle->page_size; rc = xc_tmem_control(handle->xc_handle, -1, - TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0, NULL); + TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, NULL); node->freeable_mb = (rc < 0) ? 0 : rc; /* malloc(0) is not portable, so allocate a single domain. This will * be resized below. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagV-0007gP-Rk; Wed, 09 Sep 2015 08:24:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagT-0007g5-Lm for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:49 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E5/29-02324-0DCEFE55; Wed, 09 Sep 2015 08:24:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441787085!33796977!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19808 invoked from network); 9 Sep 2015 08:24:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagP-0008Vb-Ni for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagK-0001CZ-JV for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:40 +0000 Date: Wed, 09 Sep 2015 08:24:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Move TMEM_CONTROL subop of tmem hypercall to sysctl. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0edc15a6cd30ed4cfd14c082615cc7cb3eeaefb Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 18:04:12 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Move TMEM_CONTROL subop of tmem hypercall to sysctl. The operations are to be used by an control domain to set parameters, list pools, clients, and to be used during migration. There is no need to have them in the tmem hypercall path. This patch moves code without adding fixes - and in fact in some cases makes the parameters soo long that they hurt eyes - but that is for another patch. Note that in regards to existing users: - Only the control domain could call it - which meant that if a guest called it would get -EPERM, so we are OK there. In practice no guests called this TMEM_CONTROL command. - The spec: https://oss.oracle.com/projects/tmem/dist/documentation/api/tmemspec-v001.pdf mentions: "TBD [Not sure if this is really needed.]" which is a carte blanche as any to do this! Note: The XSM check is the same - we just move it from do_tmem_op to do_sysctl. We also add an 32-bit pad to make the sysctl structure have the same exact size under 32 and 64-bit toolstacks and not worry about aligment issues. And the XLAT does not need to deal with the buf as it has been moved to another structure which is 32/64 fixed. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Daniel De Graaf Acked-by: Jen Beulich --- tools/libxc/xc_tmem.c | 106 +++++++++++++------------ tools/libxl/libxl.c | 14 ++-- tools/python/xen/lowlevel/xc/xc.c | 20 +++--- tools/xenstat/libxenstat/src/xenstat.c | 4 +- xen/common/sysctl.c | 7 ++- xen/common/tmem.c | 137 ++++++++++++++++---------------- xen/include/public/sysctl.h | 44 ++++++++++ xen/include/public/tmem.h | 43 ++--------- xen/include/xen/tmem.h | 3 + xen/include/xen/tmem_xen.h | 4 - xen/xsm/flask/hooks.c | 3 + 11 files changed, 203 insertions(+), 182 deletions(-) diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 467001b..505595b 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -47,27 +47,28 @@ static int do_tmem_op(xc_interface *xch, tmem_op_t *op) int xc_tmem_control(xc_interface *xch, int32_t pool_id, - uint32_t subop, + uint32_t cmd, uint32_t cli_id, uint32_t arg1, uint32_t arg2, void *buf) { - tmem_op_t op; + DECLARE_SYSCTL; DECLARE_HYPERCALL_BOUNCE(buf, arg1, XC_HYPERCALL_BUFFER_BOUNCE_OUT); int rc; - op.cmd = TMEM_CONTROL; - op.pool_id = pool_id; - op.u.ctrl.subop = subop; - op.u.ctrl.cli_id = cli_id; - op.u.ctrl.arg1 = arg1; - op.u.ctrl.arg2 = arg2; - op.u.ctrl.oid[0] = 0; - op.u.ctrl.oid[1] = 0; - op.u.ctrl.oid[2] = 0; - - if ( subop == TMEMC_LIST && arg1 != 0 ) + sysctl.cmd = XEN_SYSCTL_tmem_op; + sysctl.u.tmem_op.pool_id = pool_id; + sysctl.u.tmem_op.cmd = cmd; + sysctl.u.tmem_op.cli_id = cli_id; + sysctl.u.tmem_op.arg1 = arg1; + sysctl.u.tmem_op.arg2 = arg2; + sysctl.u.tmem_op.pad = 0; + sysctl.u.tmem_op.oid[0] = 0; + sysctl.u.tmem_op.oid[1] = 0; + sysctl.u.tmem_op.oid[2] = 0; + + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { if ( buf == NULL ) { @@ -81,11 +82,11 @@ int xc_tmem_control(xc_interface *xch, } } - set_xen_guest_handle(op.u.ctrl.buf, buf); + set_xen_guest_handle(sysctl.u.tmem_op.buf, buf); - rc = do_tmem_op(xch, &op); + rc = do_sysctl(xch, &sysctl); - if (subop == TMEMC_LIST && arg1 != 0) + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) xc_hypercall_bounce_post(xch, buf); return rc; @@ -93,28 +94,29 @@ int xc_tmem_control(xc_interface *xch, int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, - uint32_t subop, + uint32_t cmd, uint32_t cli_id, uint32_t arg1, uint32_t arg2, struct tmem_oid oid, void *buf) { - tmem_op_t op; + DECLARE_SYSCTL; DECLARE_HYPERCALL_BOUNCE(buf, arg1, XC_HYPERCALL_BUFFER_BOUNCE_OUT); int rc; - op.cmd = TMEM_CONTROL; - op.pool_id = pool_id; - op.u.ctrl.subop = subop; - op.u.ctrl.cli_id = cli_id; - op.u.ctrl.arg1 = arg1; - op.u.ctrl.arg2 = arg2; - op.u.ctrl.oid[0] = oid.oid[0]; - op.u.ctrl.oid[1] = oid.oid[1]; - op.u.ctrl.oid[2] = oid.oid[2]; - - if ( subop == TMEMC_LIST && arg1 != 0 ) + sysctl.cmd = XEN_SYSCTL_tmem_op; + sysctl.u.tmem_op.pool_id = pool_id; + sysctl.u.tmem_op.cmd = cmd; + sysctl.u.tmem_op.cli_id = cli_id; + sysctl.u.tmem_op.arg1 = arg1; + sysctl.u.tmem_op.arg2 = arg2; + sysctl.u.tmem_op.pad = 0; + sysctl.u.tmem_op.oid[0] = oid.oid[0]; + sysctl.u.tmem_op.oid[1] = oid.oid[1]; + sysctl.u.tmem_op.oid[2] = oid.oid[2]; + + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { if ( buf == NULL ) { @@ -128,11 +130,11 @@ int xc_tmem_control_oid(xc_interface *xch, } } - set_xen_guest_handle(op.u.ctrl.buf, buf); + set_xen_guest_handle(sysctl.u.tmem_op.buf, buf); - rc = do_tmem_op(xch, &op); + rc = do_sysctl(xch, &sysctl); - if (subop == TMEMC_LIST && arg1 != 0) + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) xc_hypercall_bounce_post(xch, buf); return rc; @@ -218,28 +220,28 @@ int xc_tmem_save(xc_interface *xch, uint32_t minusone = -1; struct tmem_handle *h; - if ( xc_tmem_control(xch,0,TMEMC_SAVE_BEGIN,dom,live,0,NULL) <= 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_BEGIN,dom,live,0,NULL) <= 0 ) return 0; if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; - version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,0,0,0,NULL); + version = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION,0,0,0,NULL); if ( write_exact(io_fd, &version, sizeof(version)) ) return -1; - max_pools = xc_tmem_control(xch,0,TMEMC_SAVE_GET_MAXPOOLS,0,0,0,NULL); + max_pools = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS,0,0,0,NULL); if ( write_exact(io_fd, &max_pools, sizeof(max_pools)) ) return -1; if ( version == -1 || max_pools == -1 ) return -1; if ( write_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; - flags = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_FLAGS,dom,0,0,NULL); + flags = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS,dom,0,0,NULL); if ( write_exact(io_fd, &flags, sizeof(flags)) ) return -1; - weight = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_WEIGHT,dom,0,0,NULL); + weight = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT,dom,0,0,NULL); if ( write_exact(io_fd, &weight, sizeof(weight)) ) return -1; - cap = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_CAP,dom,0,0,NULL); + cap = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP,dom,0,0,NULL); if ( write_exact(io_fd, &cap, sizeof(cap)) ) return -1; if ( flags == -1 || weight == -1 || cap == -1 ) @@ -256,14 +258,14 @@ int xc_tmem_save(xc_interface *xch, int checksum = 0; /* get pool id, flags, pagesize, n_pages, uuid */ - flags = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_FLAGS,dom,0,0,NULL); + flags = xc_tmem_control(xch,i,XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS,dom,0,0,NULL); if ( flags != -1 ) { pool_id = i; - n_pages = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_NPAGES,dom,0,0,NULL); + n_pages = xc_tmem_control(xch,i,XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES,dom,0,0,NULL); if ( !(flags & TMEM_POOL_PERSIST) ) n_pages = 0; - (void)xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,&uuid); + (void)xc_tmem_control(xch,i,XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,&uuid); if ( write_exact(io_fd, &pool_id, sizeof(pool_id)) ) return -1; if ( write_exact(io_fd, &flags, sizeof(flags)) ) @@ -287,7 +289,7 @@ int xc_tmem_save(xc_interface *xch, { int ret; if ( (ret = xc_tmem_control(xch, pool_id, - TMEMC_SAVE_GET_NEXT_PAGE, dom, + XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_PAGE, dom, bufsize, 0, buf)) > 0 ) { h = (struct tmem_handle *)buf; @@ -332,7 +334,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; - while ( xc_tmem_control(xch, 0, TMEMC_SAVE_GET_NEXT_INV, dom, + while ( xc_tmem_control(xch, 0, XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_INV, dom, sizeof(handle),0,&handle) > 0 ) { if ( write_exact(io_fd, &handle.pool_id, sizeof(handle.pool_id)) ) return -1; @@ -355,7 +357,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) /* only called for live migration */ void xc_tmem_save_done(xc_interface *xch, int dom) { - xc_tmem_control(xch,0,TMEMC_SAVE_END,dom,0,0,NULL); + xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_END,dom,0,0,NULL); } /* restore routines */ @@ -389,7 +391,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) uint32_t weight, cap, flags; int checksum = 0; - save_version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,dom,0,0,NULL); + save_version = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION,dom,0,0,NULL); if ( save_version == -1 ) return -1; /* domain doesn't exist */ if ( read_exact(io_fd, &this_version, sizeof(this_version)) ) @@ -401,23 +403,23 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) return -1; if ( minusone != -1 ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_RESTORE_BEGIN,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &flags, sizeof(flags)) ) return -1; if ( flags & TMEM_CLIENT_COMPRESS ) - if ( xc_tmem_control(xch,0,TMEMC_SET_COMPRESS,dom,1,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SET_COMPRESS,dom,1,0,NULL) < 0 ) return -1; if ( flags & TMEM_CLIENT_FROZEN ) - if ( xc_tmem_control(xch,0,TMEMC_FREEZE,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_FREEZE,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &weight, sizeof(weight)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_WEIGHT,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SET_WEIGHT,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &cap, sizeof(cap)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_CAP,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SET_CAP,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; @@ -464,7 +466,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) return -1; checksum += *buf; if ( (rc = xc_tmem_control_oid(xch, pool_id, - TMEMC_RESTORE_PUT_PAGE, dom, + XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE, dom, bufsize, index, oid, buf)) <= 0 ) { DPRINTF("xc_tmem_restore: putting page failed, rc=%d\n",rc); @@ -496,7 +498,7 @@ int xc_tmem_restore_extra(xc_interface *xch, int dom, int io_fd) return -1; if ( read_exact(io_fd, &index, sizeof(index)) ) return -1; - if ( xc_tmem_control_oid(xch, pool_id, TMEMC_RESTORE_FLUSH_PAGE, dom, + if ( xc_tmem_control_oid(xch, pool_id, XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE, dom, 0,index,oid,NULL) <= 0 ) return -1; count++; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e564c22..10d1909 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6045,7 +6045,7 @@ char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long) int rc; char _buf[32768]; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_LIST, domid, 32768, use_long, + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_LIST, domid, 32768, use_long, _buf); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -6060,7 +6060,7 @@ int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_FREEZE, domid, 0, 0, + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_FREEZE, domid, 0, 0, NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -6075,7 +6075,7 @@ int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_THAW, domid, 0, 0, + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_THAW, domid, 0, 0, NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -6089,11 +6089,11 @@ int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) static int32_t tmem_setop_from_string(char *set_name) { if (!strcmp(set_name, "weight")) - return TMEMC_SET_WEIGHT; + return XEN_SYSCTL_TMEM_OP_SET_WEIGHT; else if (!strcmp(set_name, "cap")) - return TMEMC_SET_CAP; + return XEN_SYSCTL_TMEM_OP_SET_CAP; else if (!strcmp(set_name, "compress")) - return TMEMC_SET_COMPRESS; + return XEN_SYSCTL_TMEM_OP_SET_COMPRESS; else return -1; } @@ -6137,7 +6137,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0); + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB, -1, 0, 0, 0); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not get tmem freeable memory"); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 024014f..9ab53fb 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1809,25 +1809,25 @@ static PyObject *pyxc_tmem_control(XcObject *self, &pool_id, &subop, &cli_id, &arg1, &arg2, &buf) ) return NULL; - if ( (subop == TMEMC_LIST) && (arg1 > 32768) ) + if ( (subop == XEN_SYSCTL_TMEM_OP_LIST) && (arg1 > 32768) ) arg1 = 32768; if ( (rc = xc_tmem_control(self->xc_handle, pool_id, subop, cli_id, arg1, arg2, buffer)) < 0 ) return Py_BuildValue("i", rc); switch (subop) { - case TMEMC_LIST: + case XEN_SYSCTL_TMEM_OP_LIST: return Py_BuildValue("s", buffer); - case TMEMC_FLUSH: + case XEN_SYSCTL_TMEM_OP_FLUSH: return Py_BuildValue("i", rc); - case TMEMC_QUERY_FREEABLE_MB: + case XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB: return Py_BuildValue("i", rc); - case TMEMC_THAW: - case TMEMC_FREEZE: - case TMEMC_DESTROY: - case TMEMC_SET_WEIGHT: - case TMEMC_SET_CAP: - case TMEMC_SET_COMPRESS: + case XEN_SYSCTL_TMEM_OP_THAW: + case XEN_SYSCTL_TMEM_OP_FREEZE: + case XEN_SYSCTL_TMEM_OP_DESTROY: + case XEN_SYSCTL_TMEM_OP_SET_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SET_CAP: + case XEN_SYSCTL_TMEM_OP_SET_COMPRESS: default: break; } diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c index 24b57d0..3495f3f 100644 --- a/tools/xenstat/libxenstat/src/xenstat.c +++ b/tools/xenstat/libxenstat/src/xenstat.c @@ -149,7 +149,7 @@ void domain_get_tmem_stats(xenstat_handle * handle, xenstat_domain * domain) { char buffer[4096]; - if (xc_tmem_control(handle->xc_handle,-1,TMEMC_LIST,domain->id, + if (xc_tmem_control(handle->xc_handle,-1,XEN_SYSCTL_TMEM_OP_LIST,domain->id, sizeof(buffer),-1,buffer) < 0) return; domain->tmem_stats.curr_eph_pages = parse(buffer,"Ec"); @@ -191,7 +191,7 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) * handle->page_size; rc = xc_tmem_control(handle->xc_handle, -1, - TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, NULL); + XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB, -1, 0, 0, NULL); node->freeable_mb = (rc < 0) ? 0 : rc; /* malloc(0) is not portable, so allocate a single domain. This will * be resized below. */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index f1c0c76..85e853f 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -68,7 +69,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_tbuf_op: ret = tb_control(&op->u.tbuf_op); break; - + case XEN_SYSCTL_sched_id: op->u.sched_id.sched_id = sched_id(); break; @@ -455,6 +456,10 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) } #endif + case XEN_SYSCTL_tmem_op: + ret = tmem_control(&op->u.tmem_op); + break; + default: ret = arch_do_sysctl(op, u_sysctl); copyback = 0; diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 6ea602b..c73add5 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -18,6 +18,7 @@ #include /* host-specific (eg Xen) code goes here */ #endif +#include #include #include #include @@ -2012,8 +2013,8 @@ fail: static int tmemc_freeze_pools(domid_t cli_id, int arg) { struct client *client; - bool_t freeze = (arg == TMEMC_FREEZE) ? 1 : 0; - bool_t destroy = (arg == TMEMC_DESTROY) ? 1 : 0; + bool_t freeze = (arg == XEN_SYSCTL_TMEM_OP_FREEZE) ? 1 : 0; + bool_t destroy = (arg == XEN_SYSCTL_TMEM_OP_DESTROY) ? 1 : 0; char *s; s = destroy ? "destroyed" : ( freeze ? "frozen" : "thawed" ); @@ -2230,7 +2231,7 @@ static int __tmemc_set_var(struct client *client, uint32_t subop, uint32_t arg1) switch (subop) { - case TMEMC_SET_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SET_WEIGHT: old_weight = client->weight; client->weight = arg1; tmem_client_info("tmem: weight set to %d for %s=%d\n", @@ -2238,12 +2239,12 @@ static int __tmemc_set_var(struct client *client, uint32_t subop, uint32_t arg1) atomic_sub(old_weight,&client_weight_total); atomic_add(client->weight,&client_weight_total); break; - case TMEMC_SET_CAP: + case XEN_SYSCTL_TMEM_OP_SET_CAP: client->cap = arg1; tmem_client_info("tmem: cap set to %d for %s=%d\n", arg1, tmem_cli_id_str, cli_id); break; - case TMEMC_SET_COMPRESS: + case XEN_SYSCTL_TMEM_OP_SET_COMPRESS: if ( tmem_dedup_enabled() ) { tmem_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n", @@ -2346,7 +2347,7 @@ static int tmemc_save_subop(int cli_id, uint32_t pool_id, switch(subop) { - case TMEMC_SAVE_BEGIN: + case XEN_SYSCTL_TMEM_OP_SAVE_BEGIN: if ( client == NULL ) return 0; for (p = 0; p < MAX_POOLS_PER_DOMAIN; p++) @@ -2363,33 +2364,33 @@ static int tmemc_save_subop(int cli_id, uint32_t pool_id, client->live_migrating = 1; rc = 1; break; - case TMEMC_RESTORE_BEGIN: + case XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN: if ( client == NULL && (client = client_create(cli_id)) != NULL ) return 1; break; - case TMEMC_SAVE_GET_VERSION: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION: rc = TMEM_SPEC_VERSION; break; - case TMEMC_SAVE_GET_MAXPOOLS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS: rc = MAX_POOLS_PER_DOMAIN; break; - case TMEMC_SAVE_GET_CLIENT_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT: if ( client == NULL ) break; rc = client->weight == -1 ? -2 : client->weight; break; - case TMEMC_SAVE_GET_CLIENT_CAP: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP: if ( client == NULL ) break; rc = client->cap == -1 ? -2 : client->cap; break; - case TMEMC_SAVE_GET_CLIENT_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS: if ( client == NULL ) break; rc = (client->compress ? TMEM_CLIENT_COMPRESS : 0 ) | (client->was_frozen ? TMEM_CLIENT_FROZEN : 0 ); break; - case TMEMC_SAVE_GET_POOL_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS: if ( pool == NULL ) break; rc = (pool->persistent ? TMEM_POOL_PERSIST : 0) | @@ -2397,19 +2398,19 @@ static int tmemc_save_subop(int cli_id, uint32_t pool_id, (POOL_PAGESHIFT << TMEM_POOL_PAGESIZE_SHIFT) | (TMEM_SPEC_VERSION << TMEM_POOL_VERSION_SHIFT); break; - case TMEMC_SAVE_GET_POOL_NPAGES: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES: if ( pool == NULL ) break; rc = _atomic_read(pool->pgp_count); break; - case TMEMC_SAVE_GET_POOL_UUID: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID: if ( pool == NULL ) break; rc = 0; if ( copy_to_guest(guest_handle_cast(buf, void), pool->uuid, 2) ) rc = -EFAULT; break; - case TMEMC_SAVE_END: + case XEN_SYSCTL_TMEM_OP_SAVE_END: if ( client == NULL ) break; client->live_migrating = 0; @@ -2553,77 +2554,75 @@ static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, struct oid *oi return do_tmem_flush_page(pool,oidp,index); } -static int do_tmem_control(struct tmem_op *op) +int tmem_control(struct xen_sysctl_tmem_op *op) { int ret; uint32_t pool_id = op->pool_id; - uint32_t subop = op->u.ctrl.subop; - struct oid *oidp = (struct oid *)(&op->u.ctrl.oid[0]); + uint32_t cmd = op->cmd; + struct oid *oidp = (struct oid *)(&op->oid[0]); - if ( xsm_tmem_control(XSM_PRIV) ) - return -EPERM; + if ( op->pad != 0 ) + return -EINVAL; - switch(subop) + write_lock(&tmem_rwlock); + + switch (cmd) { - case TMEMC_THAW: - case TMEMC_FREEZE: - case TMEMC_DESTROY: - ret = tmemc_freeze_pools(op->u.ctrl.cli_id,subop); + case XEN_SYSCTL_TMEM_OP_THAW: + case XEN_SYSCTL_TMEM_OP_FREEZE: + case XEN_SYSCTL_TMEM_OP_DESTROY: + ret = tmemc_freeze_pools(op->cli_id, cmd); break; - case TMEMC_FLUSH: - ret = tmemc_flush_mem(op->u.ctrl.cli_id,op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_FLUSH: + ret = tmemc_flush_mem(op->cli_id,op->arg1); break; - case TMEMC_LIST: - ret = tmemc_list(op->u.ctrl.cli_id, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1,op->u.ctrl.arg2); + case XEN_SYSCTL_TMEM_OP_LIST: + ret = tmemc_list(op->cli_id, + guest_handle_cast(op->buf, char), op->arg1, op->arg2); break; - case TMEMC_SET_WEIGHT: - case TMEMC_SET_CAP: - case TMEMC_SET_COMPRESS: - ret = tmemc_set_var(op->u.ctrl.cli_id,subop,op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SET_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SET_CAP: + case XEN_SYSCTL_TMEM_OP_SET_COMPRESS: + ret = tmemc_set_var(op->cli_id, cmd, op->arg1); break; - case TMEMC_QUERY_FREEABLE_MB: + case XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB: ret = tmem_freeable_pages() >> (20 - PAGE_SHIFT); break; - case TMEMC_SAVE_BEGIN: - case TMEMC_RESTORE_BEGIN: - case TMEMC_SAVE_GET_VERSION: - case TMEMC_SAVE_GET_MAXPOOLS: - case TMEMC_SAVE_GET_CLIENT_WEIGHT: - case TMEMC_SAVE_GET_CLIENT_CAP: - case TMEMC_SAVE_GET_CLIENT_FLAGS: - case TMEMC_SAVE_GET_POOL_FLAGS: - case TMEMC_SAVE_GET_POOL_NPAGES: - case TMEMC_SAVE_GET_POOL_UUID: - case TMEMC_SAVE_END: - ret = tmemc_save_subop(op->u.ctrl.cli_id,pool_id,subop, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SAVE_BEGIN: + case XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID: + case XEN_SYSCTL_TMEM_OP_SAVE_END: + ret = tmemc_save_subop(op->cli_id, pool_id, cmd, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_SAVE_GET_NEXT_PAGE: - ret = tmemc_save_get_next_page(op->u.ctrl.cli_id, pool_id, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_PAGE: + ret = tmemc_save_get_next_page(op->cli_id, pool_id, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_SAVE_GET_NEXT_INV: - ret = tmemc_save_get_next_inv(op->u.ctrl.cli_id, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_INV: + ret = tmemc_save_get_next_inv(op->cli_id, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_RESTORE_PUT_PAGE: - ret = tmemc_restore_put_page(op->u.ctrl.cli_id,pool_id, - oidp, op->u.ctrl.arg2, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE: + ret = tmemc_restore_put_page(op->cli_id, pool_id, oidp, op->arg2, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_RESTORE_FLUSH_PAGE: - ret = tmemc_restore_flush_page(op->u.ctrl.cli_id,pool_id, - oidp, op->u.ctrl.arg2); + case XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE: + ret = tmemc_restore_flush_page(op->cli_id, pool_id, oidp, op->arg2); break; default: ret = -1; } + + write_unlock(&tmem_rwlock); + return ret; } @@ -2666,7 +2665,7 @@ long do_tmem_op(tmem_cli_op_t uops) if ( op.cmd == TMEM_CONTROL ) { - rc = do_tmem_control(&op); + rc = -EOPNOTSUPP; } else if ( op.cmd == TMEM_AUTH ) { @@ -2786,7 +2785,7 @@ void tmem_destroy(void *v) write_unlock(&tmem_rwlock); } -#define MAX_EVICTS 10 /* should be variable or set via TMEMC_ ?? */ +#define MAX_EVICTS 10 /* should be variable or set via XEN_SYSCTL_TMEM_OP_ ?? */ void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) { struct page_info *pfp; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 58c9be2..fc4709a 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -710,6 +710,48 @@ struct xen_sysctl_psr_cat_op { typedef struct xen_sysctl_psr_cat_op xen_sysctl_psr_cat_op_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); +#define XEN_SYSCTL_TMEM_OP_ALL_CLIENTS 0xFFFFU + +#define XEN_SYSCTL_TMEM_OP_THAW 0 +#define XEN_SYSCTL_TMEM_OP_FREEZE 1 +#define XEN_SYSCTL_TMEM_OP_FLUSH 2 +#define XEN_SYSCTL_TMEM_OP_DESTROY 3 +#define XEN_SYSCTL_TMEM_OP_LIST 4 +#define XEN_SYSCTL_TMEM_OP_SET_WEIGHT 5 +#define XEN_SYSCTL_TMEM_OP_SET_CAP 6 +#define XEN_SYSCTL_TMEM_OP_SET_COMPRESS 7 +#define XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB 8 +#define XEN_SYSCTL_TMEM_OP_SAVE_BEGIN 10 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION 11 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS 12 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT 13 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP 14 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS 15 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS 16 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES 17 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID 18 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_PAGE 19 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_INV 20 +#define XEN_SYSCTL_TMEM_OP_SAVE_END 21 +#define XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN 30 +#define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 +#define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 + +struct xen_sysctl_tmem_op { + uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ + int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ + uint32_t cli_id; /* IN: client id, 0 for XEN_SYSCTL_TMEM_QUERY_FREEABLE_MB + for all others can be the domain id or + XEN_SYSCTL_TMEM_OP_ALL_CLIENTS for all. */ + uint32_t arg1; /* IN: If not applicable to command use 0. */ + uint32_t arg2; /* IN: If not applicable to command use 0. */ + uint32_t pad; /* Padding so structure is the same under 32 and 64. */ + uint64_t oid[3]; /* IN: If not applicable to command use 0s. */ + XEN_GUEST_HANDLE_64(char) buf; /* IN/OUT: Buffer to save and restore ops. */ +}; +typedef struct xen_sysctl_tmem_op xen_sysctl_tmem_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_sysctl_tmem_op_t); + struct xen_sysctl { uint32_t cmd; #define XEN_SYSCTL_readconsole 1 @@ -734,6 +776,7 @@ struct xen_sysctl { #define XEN_SYSCTL_psr_cmt_op 21 #define XEN_SYSCTL_pcitopoinfo 22 #define XEN_SYSCTL_psr_cat_op 23 +#define XEN_SYSCTL_tmem_op 24 uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */ union { struct xen_sysctl_readconsole readconsole; @@ -758,6 +801,7 @@ struct xen_sysctl { struct xen_sysctl_coverage_op coverage_op; struct xen_sysctl_psr_cmt_op psr_cmt_op; struct xen_sysctl_psr_cat_op psr_cat_op; + struct xen_sysctl_tmem_op tmem_op; uint8_t pad[128]; } u; }; diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index 4fd2fc6..e4ee704 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -33,7 +33,11 @@ #define TMEM_SPEC_VERSION 1 /* Commands to HYPERVISOR_tmem_op() */ -#define TMEM_CONTROL 0 +#ifdef __XEN__ +#define TMEM_CONTROL 0 /* Now called XEN_SYSCTL_tmem_op */ +#else +#undef TMEM_CONTROL +#endif #define TMEM_NEW_POOL 1 #define TMEM_DESTROY_POOL 2 #define TMEM_PUT_PAGE 4 @@ -48,35 +52,9 @@ #endif /* Privileged commands to HYPERVISOR_tmem_op() */ -#define TMEM_AUTH 101 +#define TMEM_AUTH 101 #define TMEM_RESTORE_NEW 102 -/* Subops for HYPERVISOR_tmem_op(TMEM_CONTROL) */ -#define TMEMC_THAW 0 -#define TMEMC_FREEZE 1 -#define TMEMC_FLUSH 2 -#define TMEMC_DESTROY 3 -#define TMEMC_LIST 4 -#define TMEMC_SET_WEIGHT 5 -#define TMEMC_SET_CAP 6 -#define TMEMC_SET_COMPRESS 7 -#define TMEMC_QUERY_FREEABLE_MB 8 -#define TMEMC_SAVE_BEGIN 10 -#define TMEMC_SAVE_GET_VERSION 11 -#define TMEMC_SAVE_GET_MAXPOOLS 12 -#define TMEMC_SAVE_GET_CLIENT_WEIGHT 13 -#define TMEMC_SAVE_GET_CLIENT_CAP 14 -#define TMEMC_SAVE_GET_CLIENT_FLAGS 15 -#define TMEMC_SAVE_GET_POOL_FLAGS 16 -#define TMEMC_SAVE_GET_POOL_NPAGES 17 -#define TMEMC_SAVE_GET_POOL_UUID 18 -#define TMEMC_SAVE_GET_NEXT_PAGE 19 -#define TMEMC_SAVE_GET_NEXT_INV 20 -#define TMEMC_SAVE_END 21 -#define TMEMC_RESTORE_BEGIN 30 -#define TMEMC_RESTORE_PUT_PAGE 32 -#define TMEMC_RESTORE_FLUSH_PAGE 33 - /* Bits for HYPERVISOR_tmem_op(TMEM_NEW_POOL) */ #define TMEM_POOL_PERSIST 1 #define TMEM_POOL_SHARED 2 @@ -110,16 +88,7 @@ struct tmem_op { uint32_t flags; uint32_t arg1; } creat; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */ - struct { - uint32_t subop; - uint32_t cli_id; - uint32_t arg1; - uint32_t arg2; - uint64_t oid[3]; - tmem_cli_va_t buf; - } ctrl; /* for cmd == TMEM_CONTROL */ struct { - uint64_t oid[3]; uint32_t index; uint32_t tmem_offset; diff --git a/xen/include/xen/tmem.h b/xen/include/xen/tmem.h index 5dbf9d5..32a542a 100644 --- a/xen/include/xen/tmem.h +++ b/xen/include/xen/tmem.h @@ -9,6 +9,9 @@ #ifndef __XEN_TMEM_H__ #define __XEN_TMEM_H__ +struct xen_sysctl_tmem_op; + +extern int tmem_control(struct xen_sysctl_tmem_op *op); extern void tmem_destroy(void *); extern void *tmem_relinquish_pages(unsigned int, unsigned int); extern unsigned long tmem_freeable_pages(void); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index c0d6831..0fdbf68 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -297,15 +297,11 @@ static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) switch ( cop.cmd ) { case TMEM_NEW_POOL: u = XLAT_tmem_op_u_creat; break; - case TMEM_CONTROL: u = XLAT_tmem_op_u_ctrl; break; case TMEM_AUTH: u = XLAT_tmem_op_u_creat; break; case TMEM_RESTORE_NEW:u = XLAT_tmem_op_u_creat; break; default: u = XLAT_tmem_op_u_gen ; break; } -#define XLAT_tmem_op_HNDL_u_ctrl_buf(_d_, _s_) \ - guest_from_compat_handle((_d_)->u.ctrl.buf, (_s_)->u.ctrl.buf) XLAT_tmem_op(op, &cop); -#undef XLAT_tmem_op_HNDL_u_ctrl_buf return 0; } #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7a4522e..666770a 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -801,6 +801,9 @@ static int flask_sysctl(int cmd) return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, XEN2__PSR_CAT_OP, NULL); + case XEN_SYSCTL_tmem_op: + return domain_has_xen(current->domain, XEN__TMEM_CONTROL); + default: printk("flask_sysctl: Unknown op %d\n", cmd); return -EPERM; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:24:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:24:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagV-0007gP-Rk; Wed, 09 Sep 2015 08:24:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagT-0007g5-Lm for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:49 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E5/29-02324-0DCEFE55; Wed, 09 Sep 2015 08:24:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441787085!33796977!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19808 invoked from network); 9 Sep 2015 08:24:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagP-0008Vb-Ni for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagK-0001CZ-JV for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:40 +0000 Date: Wed, 09 Sep 2015 08:24:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Move TMEM_CONTROL subop of tmem hypercall to sysctl. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0edc15a6cd30ed4cfd14c082615cc7cb3eeaefb Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 18:04:12 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Move TMEM_CONTROL subop of tmem hypercall to sysctl. The operations are to be used by an control domain to set parameters, list pools, clients, and to be used during migration. There is no need to have them in the tmem hypercall path. This patch moves code without adding fixes - and in fact in some cases makes the parameters soo long that they hurt eyes - but that is for another patch. Note that in regards to existing users: - Only the control domain could call it - which meant that if a guest called it would get -EPERM, so we are OK there. In practice no guests called this TMEM_CONTROL command. - The spec: https://oss.oracle.com/projects/tmem/dist/documentation/api/tmemspec-v001.pdf mentions: "TBD [Not sure if this is really needed.]" which is a carte blanche as any to do this! Note: The XSM check is the same - we just move it from do_tmem_op to do_sysctl. We also add an 32-bit pad to make the sysctl structure have the same exact size under 32 and 64-bit toolstacks and not worry about aligment issues. And the XLAT does not need to deal with the buf as it has been moved to another structure which is 32/64 fixed. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Daniel De Graaf Acked-by: Jen Beulich --- tools/libxc/xc_tmem.c | 106 +++++++++++++------------ tools/libxl/libxl.c | 14 ++-- tools/python/xen/lowlevel/xc/xc.c | 20 +++--- tools/xenstat/libxenstat/src/xenstat.c | 4 +- xen/common/sysctl.c | 7 ++- xen/common/tmem.c | 137 ++++++++++++++++---------------- xen/include/public/sysctl.h | 44 ++++++++++ xen/include/public/tmem.h | 43 ++--------- xen/include/xen/tmem.h | 3 + xen/include/xen/tmem_xen.h | 4 - xen/xsm/flask/hooks.c | 3 + 11 files changed, 203 insertions(+), 182 deletions(-) diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 467001b..505595b 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -47,27 +47,28 @@ static int do_tmem_op(xc_interface *xch, tmem_op_t *op) int xc_tmem_control(xc_interface *xch, int32_t pool_id, - uint32_t subop, + uint32_t cmd, uint32_t cli_id, uint32_t arg1, uint32_t arg2, void *buf) { - tmem_op_t op; + DECLARE_SYSCTL; DECLARE_HYPERCALL_BOUNCE(buf, arg1, XC_HYPERCALL_BUFFER_BOUNCE_OUT); int rc; - op.cmd = TMEM_CONTROL; - op.pool_id = pool_id; - op.u.ctrl.subop = subop; - op.u.ctrl.cli_id = cli_id; - op.u.ctrl.arg1 = arg1; - op.u.ctrl.arg2 = arg2; - op.u.ctrl.oid[0] = 0; - op.u.ctrl.oid[1] = 0; - op.u.ctrl.oid[2] = 0; - - if ( subop == TMEMC_LIST && arg1 != 0 ) + sysctl.cmd = XEN_SYSCTL_tmem_op; + sysctl.u.tmem_op.pool_id = pool_id; + sysctl.u.tmem_op.cmd = cmd; + sysctl.u.tmem_op.cli_id = cli_id; + sysctl.u.tmem_op.arg1 = arg1; + sysctl.u.tmem_op.arg2 = arg2; + sysctl.u.tmem_op.pad = 0; + sysctl.u.tmem_op.oid[0] = 0; + sysctl.u.tmem_op.oid[1] = 0; + sysctl.u.tmem_op.oid[2] = 0; + + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { if ( buf == NULL ) { @@ -81,11 +82,11 @@ int xc_tmem_control(xc_interface *xch, } } - set_xen_guest_handle(op.u.ctrl.buf, buf); + set_xen_guest_handle(sysctl.u.tmem_op.buf, buf); - rc = do_tmem_op(xch, &op); + rc = do_sysctl(xch, &sysctl); - if (subop == TMEMC_LIST && arg1 != 0) + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) xc_hypercall_bounce_post(xch, buf); return rc; @@ -93,28 +94,29 @@ int xc_tmem_control(xc_interface *xch, int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, - uint32_t subop, + uint32_t cmd, uint32_t cli_id, uint32_t arg1, uint32_t arg2, struct tmem_oid oid, void *buf) { - tmem_op_t op; + DECLARE_SYSCTL; DECLARE_HYPERCALL_BOUNCE(buf, arg1, XC_HYPERCALL_BUFFER_BOUNCE_OUT); int rc; - op.cmd = TMEM_CONTROL; - op.pool_id = pool_id; - op.u.ctrl.subop = subop; - op.u.ctrl.cli_id = cli_id; - op.u.ctrl.arg1 = arg1; - op.u.ctrl.arg2 = arg2; - op.u.ctrl.oid[0] = oid.oid[0]; - op.u.ctrl.oid[1] = oid.oid[1]; - op.u.ctrl.oid[2] = oid.oid[2]; - - if ( subop == TMEMC_LIST && arg1 != 0 ) + sysctl.cmd = XEN_SYSCTL_tmem_op; + sysctl.u.tmem_op.pool_id = pool_id; + sysctl.u.tmem_op.cmd = cmd; + sysctl.u.tmem_op.cli_id = cli_id; + sysctl.u.tmem_op.arg1 = arg1; + sysctl.u.tmem_op.arg2 = arg2; + sysctl.u.tmem_op.pad = 0; + sysctl.u.tmem_op.oid[0] = oid.oid[0]; + sysctl.u.tmem_op.oid[1] = oid.oid[1]; + sysctl.u.tmem_op.oid[2] = oid.oid[2]; + + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { if ( buf == NULL ) { @@ -128,11 +130,11 @@ int xc_tmem_control_oid(xc_interface *xch, } } - set_xen_guest_handle(op.u.ctrl.buf, buf); + set_xen_guest_handle(sysctl.u.tmem_op.buf, buf); - rc = do_tmem_op(xch, &op); + rc = do_sysctl(xch, &sysctl); - if (subop == TMEMC_LIST && arg1 != 0) + if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) xc_hypercall_bounce_post(xch, buf); return rc; @@ -218,28 +220,28 @@ int xc_tmem_save(xc_interface *xch, uint32_t minusone = -1; struct tmem_handle *h; - if ( xc_tmem_control(xch,0,TMEMC_SAVE_BEGIN,dom,live,0,NULL) <= 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_BEGIN,dom,live,0,NULL) <= 0 ) return 0; if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; - version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,0,0,0,NULL); + version = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION,0,0,0,NULL); if ( write_exact(io_fd, &version, sizeof(version)) ) return -1; - max_pools = xc_tmem_control(xch,0,TMEMC_SAVE_GET_MAXPOOLS,0,0,0,NULL); + max_pools = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS,0,0,0,NULL); if ( write_exact(io_fd, &max_pools, sizeof(max_pools)) ) return -1; if ( version == -1 || max_pools == -1 ) return -1; if ( write_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; - flags = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_FLAGS,dom,0,0,NULL); + flags = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS,dom,0,0,NULL); if ( write_exact(io_fd, &flags, sizeof(flags)) ) return -1; - weight = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_WEIGHT,dom,0,0,NULL); + weight = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT,dom,0,0,NULL); if ( write_exact(io_fd, &weight, sizeof(weight)) ) return -1; - cap = xc_tmem_control(xch,0,TMEMC_SAVE_GET_CLIENT_CAP,dom,0,0,NULL); + cap = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP,dom,0,0,NULL); if ( write_exact(io_fd, &cap, sizeof(cap)) ) return -1; if ( flags == -1 || weight == -1 || cap == -1 ) @@ -256,14 +258,14 @@ int xc_tmem_save(xc_interface *xch, int checksum = 0; /* get pool id, flags, pagesize, n_pages, uuid */ - flags = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_FLAGS,dom,0,0,NULL); + flags = xc_tmem_control(xch,i,XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS,dom,0,0,NULL); if ( flags != -1 ) { pool_id = i; - n_pages = xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_NPAGES,dom,0,0,NULL); + n_pages = xc_tmem_control(xch,i,XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES,dom,0,0,NULL); if ( !(flags & TMEM_POOL_PERSIST) ) n_pages = 0; - (void)xc_tmem_control(xch,i,TMEMC_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,&uuid); + (void)xc_tmem_control(xch,i,XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID,dom,sizeof(uuid),0,&uuid); if ( write_exact(io_fd, &pool_id, sizeof(pool_id)) ) return -1; if ( write_exact(io_fd, &flags, sizeof(flags)) ) @@ -287,7 +289,7 @@ int xc_tmem_save(xc_interface *xch, { int ret; if ( (ret = xc_tmem_control(xch, pool_id, - TMEMC_SAVE_GET_NEXT_PAGE, dom, + XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_PAGE, dom, bufsize, 0, buf)) > 0 ) { h = (struct tmem_handle *)buf; @@ -332,7 +334,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) if ( write_exact(io_fd, &marker, sizeof(marker)) ) return -1; - while ( xc_tmem_control(xch, 0, TMEMC_SAVE_GET_NEXT_INV, dom, + while ( xc_tmem_control(xch, 0, XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_INV, dom, sizeof(handle),0,&handle) > 0 ) { if ( write_exact(io_fd, &handle.pool_id, sizeof(handle.pool_id)) ) return -1; @@ -355,7 +357,7 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) /* only called for live migration */ void xc_tmem_save_done(xc_interface *xch, int dom) { - xc_tmem_control(xch,0,TMEMC_SAVE_END,dom,0,0,NULL); + xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_END,dom,0,0,NULL); } /* restore routines */ @@ -389,7 +391,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) uint32_t weight, cap, flags; int checksum = 0; - save_version = xc_tmem_control(xch,0,TMEMC_SAVE_GET_VERSION,dom,0,0,NULL); + save_version = xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION,dom,0,0,NULL); if ( save_version == -1 ) return -1; /* domain doesn't exist */ if ( read_exact(io_fd, &this_version, sizeof(this_version)) ) @@ -401,23 +403,23 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) return -1; if ( minusone != -1 ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_RESTORE_BEGIN,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &flags, sizeof(flags)) ) return -1; if ( flags & TMEM_CLIENT_COMPRESS ) - if ( xc_tmem_control(xch,0,TMEMC_SET_COMPRESS,dom,1,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SET_COMPRESS,dom,1,0,NULL) < 0 ) return -1; if ( flags & TMEM_CLIENT_FROZEN ) - if ( xc_tmem_control(xch,0,TMEMC_FREEZE,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_FREEZE,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &weight, sizeof(weight)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_WEIGHT,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SET_WEIGHT,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &cap, sizeof(cap)) ) return -1; - if ( xc_tmem_control(xch,0,TMEMC_SET_CAP,dom,0,0,NULL) < 0 ) + if ( xc_tmem_control(xch,0,XEN_SYSCTL_TMEM_OP_SET_CAP,dom,0,0,NULL) < 0 ) return -1; if ( read_exact(io_fd, &minusone, sizeof(minusone)) ) return -1; @@ -464,7 +466,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) return -1; checksum += *buf; if ( (rc = xc_tmem_control_oid(xch, pool_id, - TMEMC_RESTORE_PUT_PAGE, dom, + XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE, dom, bufsize, index, oid, buf)) <= 0 ) { DPRINTF("xc_tmem_restore: putting page failed, rc=%d\n",rc); @@ -496,7 +498,7 @@ int xc_tmem_restore_extra(xc_interface *xch, int dom, int io_fd) return -1; if ( read_exact(io_fd, &index, sizeof(index)) ) return -1; - if ( xc_tmem_control_oid(xch, pool_id, TMEMC_RESTORE_FLUSH_PAGE, dom, + if ( xc_tmem_control_oid(xch, pool_id, XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE, dom, 0,index,oid,NULL) <= 0 ) return -1; count++; diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e564c22..10d1909 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6045,7 +6045,7 @@ char *libxl_tmem_list(libxl_ctx *ctx, uint32_t domid, int use_long) int rc; char _buf[32768]; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_LIST, domid, 32768, use_long, + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_LIST, domid, 32768, use_long, _buf); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -6060,7 +6060,7 @@ int libxl_tmem_freeze(libxl_ctx *ctx, uint32_t domid) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_FREEZE, domid, 0, 0, + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_FREEZE, domid, 0, 0, NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -6075,7 +6075,7 @@ int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_THAW, domid, 0, 0, + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_THAW, domid, 0, 0, NULL); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, @@ -6089,11 +6089,11 @@ int libxl_tmem_thaw(libxl_ctx *ctx, uint32_t domid) static int32_t tmem_setop_from_string(char *set_name) { if (!strcmp(set_name, "weight")) - return TMEMC_SET_WEIGHT; + return XEN_SYSCTL_TMEM_OP_SET_WEIGHT; else if (!strcmp(set_name, "cap")) - return TMEMC_SET_CAP; + return XEN_SYSCTL_TMEM_OP_SET_CAP; else if (!strcmp(set_name, "compress")) - return TMEMC_SET_COMPRESS; + return XEN_SYSCTL_TMEM_OP_SET_COMPRESS; else return -1; } @@ -6137,7 +6137,7 @@ int libxl_tmem_freeable(libxl_ctx *ctx) { int rc; - rc = xc_tmem_control(ctx->xch, -1, TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, 0); + rc = xc_tmem_control(ctx->xch, -1, XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB, -1, 0, 0, 0); if (rc < 0) { LIBXL__LOG_ERRNOVAL(ctx, LIBXL__LOG_ERROR, rc, "Can not get tmem freeable memory"); diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 024014f..9ab53fb 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1809,25 +1809,25 @@ static PyObject *pyxc_tmem_control(XcObject *self, &pool_id, &subop, &cli_id, &arg1, &arg2, &buf) ) return NULL; - if ( (subop == TMEMC_LIST) && (arg1 > 32768) ) + if ( (subop == XEN_SYSCTL_TMEM_OP_LIST) && (arg1 > 32768) ) arg1 = 32768; if ( (rc = xc_tmem_control(self->xc_handle, pool_id, subop, cli_id, arg1, arg2, buffer)) < 0 ) return Py_BuildValue("i", rc); switch (subop) { - case TMEMC_LIST: + case XEN_SYSCTL_TMEM_OP_LIST: return Py_BuildValue("s", buffer); - case TMEMC_FLUSH: + case XEN_SYSCTL_TMEM_OP_FLUSH: return Py_BuildValue("i", rc); - case TMEMC_QUERY_FREEABLE_MB: + case XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB: return Py_BuildValue("i", rc); - case TMEMC_THAW: - case TMEMC_FREEZE: - case TMEMC_DESTROY: - case TMEMC_SET_WEIGHT: - case TMEMC_SET_CAP: - case TMEMC_SET_COMPRESS: + case XEN_SYSCTL_TMEM_OP_THAW: + case XEN_SYSCTL_TMEM_OP_FREEZE: + case XEN_SYSCTL_TMEM_OP_DESTROY: + case XEN_SYSCTL_TMEM_OP_SET_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SET_CAP: + case XEN_SYSCTL_TMEM_OP_SET_COMPRESS: default: break; } diff --git a/tools/xenstat/libxenstat/src/xenstat.c b/tools/xenstat/libxenstat/src/xenstat.c index 24b57d0..3495f3f 100644 --- a/tools/xenstat/libxenstat/src/xenstat.c +++ b/tools/xenstat/libxenstat/src/xenstat.c @@ -149,7 +149,7 @@ void domain_get_tmem_stats(xenstat_handle * handle, xenstat_domain * domain) { char buffer[4096]; - if (xc_tmem_control(handle->xc_handle,-1,TMEMC_LIST,domain->id, + if (xc_tmem_control(handle->xc_handle,-1,XEN_SYSCTL_TMEM_OP_LIST,domain->id, sizeof(buffer),-1,buffer) < 0) return; domain->tmem_stats.curr_eph_pages = parse(buffer,"Ec"); @@ -191,7 +191,7 @@ xenstat_node *xenstat_get_node(xenstat_handle * handle, unsigned int flags) * handle->page_size; rc = xc_tmem_control(handle->xc_handle, -1, - TMEMC_QUERY_FREEABLE_MB, -1, 0, 0, NULL); + XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB, -1, 0, 0, NULL); node->freeable_mb = (rc < 0) ? 0 : rc; /* malloc(0) is not portable, so allocate a single domain. This will * be resized below. */ diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index f1c0c76..85e853f 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -68,7 +69,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) case XEN_SYSCTL_tbuf_op: ret = tb_control(&op->u.tbuf_op); break; - + case XEN_SYSCTL_sched_id: op->u.sched_id.sched_id = sched_id(); break; @@ -455,6 +456,10 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) } #endif + case XEN_SYSCTL_tmem_op: + ret = tmem_control(&op->u.tmem_op); + break; + default: ret = arch_do_sysctl(op, u_sysctl); copyback = 0; diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 6ea602b..c73add5 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -18,6 +18,7 @@ #include /* host-specific (eg Xen) code goes here */ #endif +#include #include #include #include @@ -2012,8 +2013,8 @@ fail: static int tmemc_freeze_pools(domid_t cli_id, int arg) { struct client *client; - bool_t freeze = (arg == TMEMC_FREEZE) ? 1 : 0; - bool_t destroy = (arg == TMEMC_DESTROY) ? 1 : 0; + bool_t freeze = (arg == XEN_SYSCTL_TMEM_OP_FREEZE) ? 1 : 0; + bool_t destroy = (arg == XEN_SYSCTL_TMEM_OP_DESTROY) ? 1 : 0; char *s; s = destroy ? "destroyed" : ( freeze ? "frozen" : "thawed" ); @@ -2230,7 +2231,7 @@ static int __tmemc_set_var(struct client *client, uint32_t subop, uint32_t arg1) switch (subop) { - case TMEMC_SET_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SET_WEIGHT: old_weight = client->weight; client->weight = arg1; tmem_client_info("tmem: weight set to %d for %s=%d\n", @@ -2238,12 +2239,12 @@ static int __tmemc_set_var(struct client *client, uint32_t subop, uint32_t arg1) atomic_sub(old_weight,&client_weight_total); atomic_add(client->weight,&client_weight_total); break; - case TMEMC_SET_CAP: + case XEN_SYSCTL_TMEM_OP_SET_CAP: client->cap = arg1; tmem_client_info("tmem: cap set to %d for %s=%d\n", arg1, tmem_cli_id_str, cli_id); break; - case TMEMC_SET_COMPRESS: + case XEN_SYSCTL_TMEM_OP_SET_COMPRESS: if ( tmem_dedup_enabled() ) { tmem_client_warn("tmem: compression %s for all %ss, cannot be changed when tmem_dedup is enabled\n", @@ -2346,7 +2347,7 @@ static int tmemc_save_subop(int cli_id, uint32_t pool_id, switch(subop) { - case TMEMC_SAVE_BEGIN: + case XEN_SYSCTL_TMEM_OP_SAVE_BEGIN: if ( client == NULL ) return 0; for (p = 0; p < MAX_POOLS_PER_DOMAIN; p++) @@ -2363,33 +2364,33 @@ static int tmemc_save_subop(int cli_id, uint32_t pool_id, client->live_migrating = 1; rc = 1; break; - case TMEMC_RESTORE_BEGIN: + case XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN: if ( client == NULL && (client = client_create(cli_id)) != NULL ) return 1; break; - case TMEMC_SAVE_GET_VERSION: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION: rc = TMEM_SPEC_VERSION; break; - case TMEMC_SAVE_GET_MAXPOOLS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS: rc = MAX_POOLS_PER_DOMAIN; break; - case TMEMC_SAVE_GET_CLIENT_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT: if ( client == NULL ) break; rc = client->weight == -1 ? -2 : client->weight; break; - case TMEMC_SAVE_GET_CLIENT_CAP: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP: if ( client == NULL ) break; rc = client->cap == -1 ? -2 : client->cap; break; - case TMEMC_SAVE_GET_CLIENT_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS: if ( client == NULL ) break; rc = (client->compress ? TMEM_CLIENT_COMPRESS : 0 ) | (client->was_frozen ? TMEM_CLIENT_FROZEN : 0 ); break; - case TMEMC_SAVE_GET_POOL_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS: if ( pool == NULL ) break; rc = (pool->persistent ? TMEM_POOL_PERSIST : 0) | @@ -2397,19 +2398,19 @@ static int tmemc_save_subop(int cli_id, uint32_t pool_id, (POOL_PAGESHIFT << TMEM_POOL_PAGESIZE_SHIFT) | (TMEM_SPEC_VERSION << TMEM_POOL_VERSION_SHIFT); break; - case TMEMC_SAVE_GET_POOL_NPAGES: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES: if ( pool == NULL ) break; rc = _atomic_read(pool->pgp_count); break; - case TMEMC_SAVE_GET_POOL_UUID: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID: if ( pool == NULL ) break; rc = 0; if ( copy_to_guest(guest_handle_cast(buf, void), pool->uuid, 2) ) rc = -EFAULT; break; - case TMEMC_SAVE_END: + case XEN_SYSCTL_TMEM_OP_SAVE_END: if ( client == NULL ) break; client->live_migrating = 0; @@ -2553,77 +2554,75 @@ static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, struct oid *oi return do_tmem_flush_page(pool,oidp,index); } -static int do_tmem_control(struct tmem_op *op) +int tmem_control(struct xen_sysctl_tmem_op *op) { int ret; uint32_t pool_id = op->pool_id; - uint32_t subop = op->u.ctrl.subop; - struct oid *oidp = (struct oid *)(&op->u.ctrl.oid[0]); + uint32_t cmd = op->cmd; + struct oid *oidp = (struct oid *)(&op->oid[0]); - if ( xsm_tmem_control(XSM_PRIV) ) - return -EPERM; + if ( op->pad != 0 ) + return -EINVAL; - switch(subop) + write_lock(&tmem_rwlock); + + switch (cmd) { - case TMEMC_THAW: - case TMEMC_FREEZE: - case TMEMC_DESTROY: - ret = tmemc_freeze_pools(op->u.ctrl.cli_id,subop); + case XEN_SYSCTL_TMEM_OP_THAW: + case XEN_SYSCTL_TMEM_OP_FREEZE: + case XEN_SYSCTL_TMEM_OP_DESTROY: + ret = tmemc_freeze_pools(op->cli_id, cmd); break; - case TMEMC_FLUSH: - ret = tmemc_flush_mem(op->u.ctrl.cli_id,op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_FLUSH: + ret = tmemc_flush_mem(op->cli_id,op->arg1); break; - case TMEMC_LIST: - ret = tmemc_list(op->u.ctrl.cli_id, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1,op->u.ctrl.arg2); + case XEN_SYSCTL_TMEM_OP_LIST: + ret = tmemc_list(op->cli_id, + guest_handle_cast(op->buf, char), op->arg1, op->arg2); break; - case TMEMC_SET_WEIGHT: - case TMEMC_SET_CAP: - case TMEMC_SET_COMPRESS: - ret = tmemc_set_var(op->u.ctrl.cli_id,subop,op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SET_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SET_CAP: + case XEN_SYSCTL_TMEM_OP_SET_COMPRESS: + ret = tmemc_set_var(op->cli_id, cmd, op->arg1); break; - case TMEMC_QUERY_FREEABLE_MB: + case XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB: ret = tmem_freeable_pages() >> (20 - PAGE_SHIFT); break; - case TMEMC_SAVE_BEGIN: - case TMEMC_RESTORE_BEGIN: - case TMEMC_SAVE_GET_VERSION: - case TMEMC_SAVE_GET_MAXPOOLS: - case TMEMC_SAVE_GET_CLIENT_WEIGHT: - case TMEMC_SAVE_GET_CLIENT_CAP: - case TMEMC_SAVE_GET_CLIENT_FLAGS: - case TMEMC_SAVE_GET_POOL_FLAGS: - case TMEMC_SAVE_GET_POOL_NPAGES: - case TMEMC_SAVE_GET_POOL_UUID: - case TMEMC_SAVE_END: - ret = tmemc_save_subop(op->u.ctrl.cli_id,pool_id,subop, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SAVE_BEGIN: + case XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES: + case XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID: + case XEN_SYSCTL_TMEM_OP_SAVE_END: + ret = tmemc_save_subop(op->cli_id, pool_id, cmd, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_SAVE_GET_NEXT_PAGE: - ret = tmemc_save_get_next_page(op->u.ctrl.cli_id, pool_id, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_PAGE: + ret = tmemc_save_get_next_page(op->cli_id, pool_id, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_SAVE_GET_NEXT_INV: - ret = tmemc_save_get_next_inv(op->u.ctrl.cli_id, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_INV: + ret = tmemc_save_get_next_inv(op->cli_id, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_RESTORE_PUT_PAGE: - ret = tmemc_restore_put_page(op->u.ctrl.cli_id,pool_id, - oidp, op->u.ctrl.arg2, - guest_handle_cast(op->u.ctrl.buf, char), - op->u.ctrl.arg1); + case XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE: + ret = tmemc_restore_put_page(op->cli_id, pool_id, oidp, op->arg2, + guest_handle_cast(op->buf, char), op->arg1); break; - case TMEMC_RESTORE_FLUSH_PAGE: - ret = tmemc_restore_flush_page(op->u.ctrl.cli_id,pool_id, - oidp, op->u.ctrl.arg2); + case XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE: + ret = tmemc_restore_flush_page(op->cli_id, pool_id, oidp, op->arg2); break; default: ret = -1; } + + write_unlock(&tmem_rwlock); + return ret; } @@ -2666,7 +2665,7 @@ long do_tmem_op(tmem_cli_op_t uops) if ( op.cmd == TMEM_CONTROL ) { - rc = do_tmem_control(&op); + rc = -EOPNOTSUPP; } else if ( op.cmd == TMEM_AUTH ) { @@ -2786,7 +2785,7 @@ void tmem_destroy(void *v) write_unlock(&tmem_rwlock); } -#define MAX_EVICTS 10 /* should be variable or set via TMEMC_ ?? */ +#define MAX_EVICTS 10 /* should be variable or set via XEN_SYSCTL_TMEM_OP_ ?? */ void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) { struct page_info *pfp; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 58c9be2..fc4709a 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -710,6 +710,48 @@ struct xen_sysctl_psr_cat_op { typedef struct xen_sysctl_psr_cat_op xen_sysctl_psr_cat_op_t; DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); +#define XEN_SYSCTL_TMEM_OP_ALL_CLIENTS 0xFFFFU + +#define XEN_SYSCTL_TMEM_OP_THAW 0 +#define XEN_SYSCTL_TMEM_OP_FREEZE 1 +#define XEN_SYSCTL_TMEM_OP_FLUSH 2 +#define XEN_SYSCTL_TMEM_OP_DESTROY 3 +#define XEN_SYSCTL_TMEM_OP_LIST 4 +#define XEN_SYSCTL_TMEM_OP_SET_WEIGHT 5 +#define XEN_SYSCTL_TMEM_OP_SET_CAP 6 +#define XEN_SYSCTL_TMEM_OP_SET_COMPRESS 7 +#define XEN_SYSCTL_TMEM_OP_QUERY_FREEABLE_MB 8 +#define XEN_SYSCTL_TMEM_OP_SAVE_BEGIN 10 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_VERSION 11 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_MAXPOOLS 12 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_WEIGHT 13 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_CAP 14 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_CLIENT_FLAGS 15 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_FLAGS 16 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_NPAGES 17 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_POOL_UUID 18 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_PAGE 19 +#define XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_INV 20 +#define XEN_SYSCTL_TMEM_OP_SAVE_END 21 +#define XEN_SYSCTL_TMEM_OP_RESTORE_BEGIN 30 +#define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 +#define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 + +struct xen_sysctl_tmem_op { + uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ + int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ + uint32_t cli_id; /* IN: client id, 0 for XEN_SYSCTL_TMEM_QUERY_FREEABLE_MB + for all others can be the domain id or + XEN_SYSCTL_TMEM_OP_ALL_CLIENTS for all. */ + uint32_t arg1; /* IN: If not applicable to command use 0. */ + uint32_t arg2; /* IN: If not applicable to command use 0. */ + uint32_t pad; /* Padding so structure is the same under 32 and 64. */ + uint64_t oid[3]; /* IN: If not applicable to command use 0s. */ + XEN_GUEST_HANDLE_64(char) buf; /* IN/OUT: Buffer to save and restore ops. */ +}; +typedef struct xen_sysctl_tmem_op xen_sysctl_tmem_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_sysctl_tmem_op_t); + struct xen_sysctl { uint32_t cmd; #define XEN_SYSCTL_readconsole 1 @@ -734,6 +776,7 @@ struct xen_sysctl { #define XEN_SYSCTL_psr_cmt_op 21 #define XEN_SYSCTL_pcitopoinfo 22 #define XEN_SYSCTL_psr_cat_op 23 +#define XEN_SYSCTL_tmem_op 24 uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */ union { struct xen_sysctl_readconsole readconsole; @@ -758,6 +801,7 @@ struct xen_sysctl { struct xen_sysctl_coverage_op coverage_op; struct xen_sysctl_psr_cmt_op psr_cmt_op; struct xen_sysctl_psr_cat_op psr_cat_op; + struct xen_sysctl_tmem_op tmem_op; uint8_t pad[128]; } u; }; diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index 4fd2fc6..e4ee704 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -33,7 +33,11 @@ #define TMEM_SPEC_VERSION 1 /* Commands to HYPERVISOR_tmem_op() */ -#define TMEM_CONTROL 0 +#ifdef __XEN__ +#define TMEM_CONTROL 0 /* Now called XEN_SYSCTL_tmem_op */ +#else +#undef TMEM_CONTROL +#endif #define TMEM_NEW_POOL 1 #define TMEM_DESTROY_POOL 2 #define TMEM_PUT_PAGE 4 @@ -48,35 +52,9 @@ #endif /* Privileged commands to HYPERVISOR_tmem_op() */ -#define TMEM_AUTH 101 +#define TMEM_AUTH 101 #define TMEM_RESTORE_NEW 102 -/* Subops for HYPERVISOR_tmem_op(TMEM_CONTROL) */ -#define TMEMC_THAW 0 -#define TMEMC_FREEZE 1 -#define TMEMC_FLUSH 2 -#define TMEMC_DESTROY 3 -#define TMEMC_LIST 4 -#define TMEMC_SET_WEIGHT 5 -#define TMEMC_SET_CAP 6 -#define TMEMC_SET_COMPRESS 7 -#define TMEMC_QUERY_FREEABLE_MB 8 -#define TMEMC_SAVE_BEGIN 10 -#define TMEMC_SAVE_GET_VERSION 11 -#define TMEMC_SAVE_GET_MAXPOOLS 12 -#define TMEMC_SAVE_GET_CLIENT_WEIGHT 13 -#define TMEMC_SAVE_GET_CLIENT_CAP 14 -#define TMEMC_SAVE_GET_CLIENT_FLAGS 15 -#define TMEMC_SAVE_GET_POOL_FLAGS 16 -#define TMEMC_SAVE_GET_POOL_NPAGES 17 -#define TMEMC_SAVE_GET_POOL_UUID 18 -#define TMEMC_SAVE_GET_NEXT_PAGE 19 -#define TMEMC_SAVE_GET_NEXT_INV 20 -#define TMEMC_SAVE_END 21 -#define TMEMC_RESTORE_BEGIN 30 -#define TMEMC_RESTORE_PUT_PAGE 32 -#define TMEMC_RESTORE_FLUSH_PAGE 33 - /* Bits for HYPERVISOR_tmem_op(TMEM_NEW_POOL) */ #define TMEM_POOL_PERSIST 1 #define TMEM_POOL_SHARED 2 @@ -110,16 +88,7 @@ struct tmem_op { uint32_t flags; uint32_t arg1; } creat; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */ - struct { - uint32_t subop; - uint32_t cli_id; - uint32_t arg1; - uint32_t arg2; - uint64_t oid[3]; - tmem_cli_va_t buf; - } ctrl; /* for cmd == TMEM_CONTROL */ struct { - uint64_t oid[3]; uint32_t index; uint32_t tmem_offset; diff --git a/xen/include/xen/tmem.h b/xen/include/xen/tmem.h index 5dbf9d5..32a542a 100644 --- a/xen/include/xen/tmem.h +++ b/xen/include/xen/tmem.h @@ -9,6 +9,9 @@ #ifndef __XEN_TMEM_H__ #define __XEN_TMEM_H__ +struct xen_sysctl_tmem_op; + +extern int tmem_control(struct xen_sysctl_tmem_op *op); extern void tmem_destroy(void *); extern void *tmem_relinquish_pages(unsigned int, unsigned int); extern unsigned long tmem_freeable_pages(void); diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index c0d6831..0fdbf68 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -297,15 +297,11 @@ static inline int tmem_get_tmemop_from_client(tmem_op_t *op, tmem_cli_op_t uops) switch ( cop.cmd ) { case TMEM_NEW_POOL: u = XLAT_tmem_op_u_creat; break; - case TMEM_CONTROL: u = XLAT_tmem_op_u_ctrl; break; case TMEM_AUTH: u = XLAT_tmem_op_u_creat; break; case TMEM_RESTORE_NEW:u = XLAT_tmem_op_u_creat; break; default: u = XLAT_tmem_op_u_gen ; break; } -#define XLAT_tmem_op_HNDL_u_ctrl_buf(_d_, _s_) \ - guest_from_compat_handle((_d_)->u.ctrl.buf, (_s_)->u.ctrl.buf) XLAT_tmem_op(op, &cop); -#undef XLAT_tmem_op_HNDL_u_ctrl_buf return 0; } #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 7a4522e..666770a 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -801,6 +801,9 @@ static int flask_sysctl(int cmd) return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, XEN2__PSR_CAT_OP, NULL); + case XEN_SYSCTL_tmem_op: + return domain_has_xen(current->domain, XEN__TMEM_CONTROL); + default: printk("flask_sysctl: Unknown op %d\n", cmd); return -EPERM; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZagf-0007iC-0u; Wed, 09 Sep 2015 08:25:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagd-0007ho-Aw for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:59 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 36/29-12371-ADCEFE55; Wed, 09 Sep 2015 08:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1441787096!48078025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12335 invoked from network); 9 Sep 2015 08:24:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagZ-0008Vj-SP for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagZ-0001Dr-RZ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:55 +0000 Date: Wed, 09 Sep 2015 08:24:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove the old tmem control XSM checks as it is part of sysctl hypercall. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad1b7a1392190908e122054a4af4832fef877305 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 17:36:21 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Remove the old tmem control XSM checks as it is part of sysctl hypercall. The sysctl is where the tmem control operations are done and the XSM checks are done via there. The old mechanism (to check for control tmem op XSM from do_tmem_op) is not needed anymore. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 6 ------ xen/include/xsm/xsm.h | 6 ------ xen/xsm/dummy.c | 1 - xen/xsm/flask/hooks.c | 6 ------ xen/xsm/flask/policy/access_vectors | 2 +- 5 files changed, 1 insertions(+), 20 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index bbbfce7..9fe372c 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -427,12 +427,6 @@ static XSM_INLINE int xsm_tmem_op(XSM_DEFAULT_VOID) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_tmem_control(XSM_DEFAULT_VOID) -{ - XSM_ASSERT_ACTION(XSM_PRIV); - return xsm_default_action(action, current->domain, NULL); -} - static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) { return -ENOSYS; diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 3678a93..ba3caed 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -137,7 +137,6 @@ struct xsm_operations { int (*page_offline)(uint32_t cmd); int (*tmem_op)(void); - int (*tmem_control)(void); long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); #ifdef CONFIG_COMPAT @@ -557,11 +556,6 @@ static inline int xsm_tmem_op(xsm_default_t def) return xsm_ops->tmem_op(); } -static inline int xsm_tmem_control(xsm_default_t def) -{ - return xsm_ops->tmem_control(); -} - static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) { return xsm_ops->do_xsm_op(op); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 21b1bf8..72eba40 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -112,7 +112,6 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, page_offline); set_to_dummy_if_null(ops, tmem_op); - set_to_dummy_if_null(ops, tmem_control); set_to_dummy_if_null(ops, hvm_param); set_to_dummy_if_null(ops, hvm_control); set_to_dummy_if_null(ops, hvm_param_nested); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 666770a..fafb1a4 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1132,11 +1132,6 @@ static inline int flask_tmem_op(void) return domain_has_xen(current->domain, XEN__TMEM_OP); } -static inline int flask_tmem_control(void) -{ - return domain_has_xen(current->domain, XEN__TMEM_CONTROL); -} - static int flask_add_to_physmap(struct domain *d1, struct domain *d2) { return domain_has_perm(d1, d2, SECCLASS_MMU, MMU__PHYSMAP); @@ -1696,7 +1691,6 @@ static struct xsm_operations flask_ops = { .page_offline = flask_page_offline, .tmem_op = flask_tmem_op, - .tmem_control = flask_tmem_control, .hvm_param = flask_hvm_param, .hvm_control = flask_hvm_param, .hvm_param_nested = flask_hvm_param_nested, diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 71495fd..0aa68f8 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -69,7 +69,7 @@ class xen cpupool_op # tmem hypercall (any access) tmem_op -# TMEM_CONTROL command of tmem hypercall +# XEN_SYSCTL_tmem_op command of tmem (part of sysctl) tmem_control # XEN_SYSCTL_scheduler_op with XEN_DOMCTL_SCHEDOP_getinfo, XEN_SYSCTL_sched_id getscheduler -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZagf-0007iC-0u; Wed, 09 Sep 2015 08:25:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagd-0007ho-Aw for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:59 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 36/29-12371-ADCEFE55; Wed, 09 Sep 2015 08:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1441787096!48078025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12335 invoked from network); 9 Sep 2015 08:24:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:24:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagZ-0008Vj-SP for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagZ-0001Dr-RZ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:24:55 +0000 Date: Wed, 09 Sep 2015 08:24:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove the old tmem control XSM checks as it is part of sysctl hypercall. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad1b7a1392190908e122054a4af4832fef877305 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Aug 26 17:36:21 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Remove the old tmem control XSM checks as it is part of sysctl hypercall. The sysctl is where the tmem control operations are done and the XSM checks are done via there. The old mechanism (to check for control tmem op XSM from do_tmem_op) is not needed anymore. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Daniel De Graaf --- xen/include/xsm/dummy.h | 6 ------ xen/include/xsm/xsm.h | 6 ------ xen/xsm/dummy.c | 1 - xen/xsm/flask/hooks.c | 6 ------ xen/xsm/flask/policy/access_vectors | 2 +- 5 files changed, 1 insertions(+), 20 deletions(-) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index bbbfce7..9fe372c 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -427,12 +427,6 @@ static XSM_INLINE int xsm_tmem_op(XSM_DEFAULT_VOID) return xsm_default_action(action, current->domain, NULL); } -static XSM_INLINE int xsm_tmem_control(XSM_DEFAULT_VOID) -{ - XSM_ASSERT_ACTION(XSM_PRIV); - return xsm_default_action(action, current->domain, NULL); -} - static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) { return -ENOSYS; diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 3678a93..ba3caed 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -137,7 +137,6 @@ struct xsm_operations { int (*page_offline)(uint32_t cmd); int (*tmem_op)(void); - int (*tmem_control)(void); long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); #ifdef CONFIG_COMPAT @@ -557,11 +556,6 @@ static inline int xsm_tmem_op(xsm_default_t def) return xsm_ops->tmem_op(); } -static inline int xsm_tmem_control(xsm_default_t def) -{ - return xsm_ops->tmem_control(); -} - static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) { return xsm_ops->do_xsm_op(op); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 21b1bf8..72eba40 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -112,7 +112,6 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, page_offline); set_to_dummy_if_null(ops, tmem_op); - set_to_dummy_if_null(ops, tmem_control); set_to_dummy_if_null(ops, hvm_param); set_to_dummy_if_null(ops, hvm_control); set_to_dummy_if_null(ops, hvm_param_nested); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 666770a..fafb1a4 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1132,11 +1132,6 @@ static inline int flask_tmem_op(void) return domain_has_xen(current->domain, XEN__TMEM_OP); } -static inline int flask_tmem_control(void) -{ - return domain_has_xen(current->domain, XEN__TMEM_CONTROL); -} - static int flask_add_to_physmap(struct domain *d1, struct domain *d2) { return domain_has_perm(d1, d2, SECCLASS_MMU, MMU__PHYSMAP); @@ -1696,7 +1691,6 @@ static struct xsm_operations flask_ops = { .page_offline = flask_page_offline, .tmem_op = flask_tmem_op, - .tmem_control = flask_tmem_control, .hvm_param = flask_hvm_param, .hvm_control = flask_hvm_param, .hvm_param_nested = flask_hvm_param_nested, diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 71495fd..0aa68f8 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -69,7 +69,7 @@ class xen cpupool_op # tmem hypercall (any access) tmem_op -# TMEM_CONTROL command of tmem hypercall +# XEN_SYSCTL_tmem_op command of tmem (part of sysctl) tmem_control # XEN_SYSCTL_scheduler_op with XEN_DOMCTL_SCHEDOP_getinfo, XEN_SYSCTL_sched_id getscheduler -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZagq-0007jx-3a; Wed, 09 Sep 2015 08:25:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZago-0007jY-C6 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:10 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 6B/C7-25435-5ECEFE55; Wed, 09 Sep 2015 08:25:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1441787106!48119424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32558 invoked from network); 9 Sep 2015 08:25:08 -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; 9 Sep 2015 08:25:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagk-0008WO-3u for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagk-0001Eo-0z for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:06 +0000 Date: Wed, 09 Sep 2015 08:25:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Make the uint64_t oid[3] a proper structure: xen_tmem_oid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 987e64e05cc2e4a230ca364123d369dcc9a7b776 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 10:57:27 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Make the uint64_t oid[3] a proper structure: xen_tmem_oid And use it almost everywhere. It is easy to use it for the sysctl since the hypervisor and toolstack are intertwined. But for the tmem hypercall we need to be dilligient (as it is guest facing) so delaying that to another patch: "tmem: Use 'struct xen_tmem_oid' for every user" to help with bisection issues. We also move some of the parameters on functions to be within the right location. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jen Beulich --- tools/libxc/include/xenctrl.h | 6 +--- tools/libxc/xc_tmem.c | 16 +++++------ xen/common/tmem.c | 57 ++++++++++++++++++++++------------------ xen/include/public/sysctl.h | 8 +++++- 4 files changed, 46 insertions(+), 41 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 9e34769..2000f12 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2295,13 +2295,9 @@ int xc_disable_turbo(xc_interface *xch, int cpuid); * tmem operations */ -struct tmem_oid { - uint64_t oid[3]; -}; - int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, uint32_t subop, uint32_t cli_id, uint32_t arg1, uint32_t arg2, - struct tmem_oid oid, void *buf); + struct xen_tmem_oid oid, void *buf); int xc_tmem_control(xc_interface *xch, int32_t pool_id, uint32_t subop, uint32_t cli_id, uint32_t arg1, uint32_t arg2, void *buf); diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 505595b..558d2ea 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -64,9 +64,9 @@ int xc_tmem_control(xc_interface *xch, sysctl.u.tmem_op.arg1 = arg1; sysctl.u.tmem_op.arg2 = arg2; sysctl.u.tmem_op.pad = 0; - sysctl.u.tmem_op.oid[0] = 0; - sysctl.u.tmem_op.oid[1] = 0; - sysctl.u.tmem_op.oid[2] = 0; + sysctl.u.tmem_op.oid.oid[0] = 0; + sysctl.u.tmem_op.oid.oid[1] = 0; + sysctl.u.tmem_op.oid.oid[2] = 0; if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { @@ -98,7 +98,7 @@ int xc_tmem_control_oid(xc_interface *xch, uint32_t cli_id, uint32_t arg1, uint32_t arg2, - struct tmem_oid oid, + struct xen_tmem_oid oid, void *buf) { DECLARE_SYSCTL; @@ -112,9 +112,7 @@ int xc_tmem_control_oid(xc_interface *xch, sysctl.u.tmem_op.arg1 = arg1; sysctl.u.tmem_op.arg2 = arg2; sysctl.u.tmem_op.pad = 0; - sysctl.u.tmem_op.oid[0] = oid.oid[0]; - sysctl.u.tmem_op.oid[1] = oid.oid[1]; - sysctl.u.tmem_op.oid[2] = oid.oid[2]; + sysctl.u.tmem_op.oid = oid; if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { @@ -453,7 +451,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) } for ( j = n_pages; j > 0; j-- ) { - struct tmem_oid oid; + struct xen_tmem_oid oid; uint32_t index; int rc; if ( read_exact(io_fd, &oid, sizeof(oid)) ) @@ -487,7 +485,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) int xc_tmem_restore_extra(xc_interface *xch, int dom, int io_fd) { uint32_t pool_id; - struct tmem_oid oid; + struct xen_tmem_oid oid; uint32_t index; int count = 0; int checksum = 0; diff --git a/xen/common/tmem.c b/xen/common/tmem.c index c73add5..5260c6c 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -125,12 +125,8 @@ struct tmem_pool { #define is_persistent(_p) (_p->persistent) #define is_shared(_p) (_p->shared) -struct oid { - uint64_t oid[3]; -}; - struct tmem_object_root { - struct oid oid; + struct xen_tmem_oid oid; struct rb_node rb_tree_node; /* protected by pool->pool_rwlock */ unsigned long objnode_count; /* atomicity depends on obj_spinlock */ long pgp_count; /* atomicity depends on obj_spinlock */ @@ -158,7 +154,7 @@ struct tmem_page_descriptor { }; struct tmem_object_root *obj; } us; - struct oid inv_oid; /* used for invalid list only */ + struct xen_tmem_oid inv_oid; /* used for invalid list only */ }; pagesize_t size; /* 0 == PAGE_SIZE (pfp), -1 == data invalid, else compressed data (cdata) */ @@ -815,7 +811,8 @@ static void rtn_free(struct radix_tree_node *rtn, void *arg) /************ POOL OBJECT COLLECTION MANIPULATION ROUTINES *******************/ -static int oid_compare(struct oid *left, struct oid *right) +static int oid_compare(struct xen_tmem_oid *left, + struct xen_tmem_oid *right) { if ( left->oid[2] == right->oid[2] ) { @@ -839,19 +836,20 @@ static int oid_compare(struct oid *left, struct oid *right) return 1; } -static void oid_set_invalid(struct oid *oidp) +static void oid_set_invalid(struct xen_tmem_oid *oidp) { oidp->oid[0] = oidp->oid[1] = oidp->oid[2] = -1UL; } -static unsigned oid_hash(struct oid *oidp) +static unsigned oid_hash(struct xen_tmem_oid *oidp) { return (tmem_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } /* searches for object==oid in pool, returns locked object if found */ -static struct tmem_object_root * obj_find(struct tmem_pool *pool, struct oid *oidp) +static struct tmem_object_root * obj_find(struct tmem_pool *pool, + struct xen_tmem_oid *oidp) { struct rb_node *node; struct tmem_object_root *obj; @@ -887,7 +885,7 @@ restart_find: static void obj_free(struct tmem_object_root *obj) { struct tmem_pool *pool; - struct oid old_oid; + struct xen_tmem_oid old_oid; ASSERT_SPINLOCK(&obj->obj_spinlock); ASSERT(obj != NULL); @@ -946,7 +944,8 @@ static int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) * allocate, initialize, and insert an tmem_object_root * (should be called only if find failed) */ -static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, struct oid *oidp) +static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, + struct xen_tmem_oid *oidp) { struct tmem_object_root *obj; @@ -1531,8 +1530,8 @@ cleanup: } static int do_tmem_put(struct tmem_pool *pool, - struct oid *oidp, uint32_t index, - xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) + struct xen_tmem_oid *oidp, uint32_t index, + xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { struct tmem_object_root *obj = NULL; struct tmem_page_descriptor *pgp = NULL; @@ -1696,8 +1695,9 @@ unlock_obj: return ret; } -static int do_tmem_get(struct tmem_pool *pool, struct oid *oidp, uint32_t index, - xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) +static int do_tmem_get(struct tmem_pool *pool, + struct xen_tmem_oid *oidp, uint32_t index, + xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { struct tmem_object_root *obj; struct tmem_page_descriptor *pgp; @@ -1774,7 +1774,8 @@ bad_copy: return rc; } -static int do_tmem_flush_page(struct tmem_pool *pool, struct oid *oidp, uint32_t index) +static int do_tmem_flush_page(struct tmem_pool *pool, + struct xen_tmem_oid *oidp, uint32_t index) { struct tmem_object_root *obj; struct tmem_page_descriptor *pgp; @@ -1807,7 +1808,8 @@ out: return 1; } -static int do_tmem_flush_object(struct tmem_pool *pool, struct oid *oidp) +static int do_tmem_flush_object(struct tmem_pool *pool, + struct xen_tmem_oid *oidp) { struct tmem_object_root *obj; @@ -2432,7 +2434,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; struct tmem_page_descriptor *pgp; - struct oid oid; + struct xen_tmem_oid oid; int ret = 0; struct tmem_handle h; @@ -2525,8 +2527,10 @@ out: return ret; } -static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, struct oid *oidp, - uint32_t index, tmem_cli_va_param_t buf, uint32_t bufsize) +static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, + struct xen_tmem_oid *oidp, + uint32_t index, tmem_cli_va_param_t buf, + uint32_t bufsize) { struct client *client = tmem_client_from_cli_id(cli_id); struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) @@ -2542,8 +2546,9 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, struct oid *oidp return do_tmem_put(pool, oidp, index, 0, buf); } -static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, struct oid *oidp, - uint32_t index) +static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, + struct xen_tmem_oid *oidp, + uint32_t index) { struct client *client = tmem_client_from_cli_id(cli_id); struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) @@ -2559,7 +2564,7 @@ int tmem_control(struct xen_sysctl_tmem_op *op) int ret; uint32_t pool_id = op->pool_id; uint32_t cmd = op->cmd; - struct oid *oidp = (struct oid *)(&op->oid[0]); + struct xen_tmem_oid *oidp = &op->oid; if ( op->pad != 0 ) return -EINVAL; @@ -2633,7 +2638,7 @@ long do_tmem_op(tmem_cli_op_t uops) struct tmem_op op; struct client *client = current->domain->tmem_client; struct tmem_pool *pool = NULL; - struct oid *oidp; + struct xen_tmem_oid *oidp; int rc = 0; bool_t succ_get = 0, succ_put = 0; bool_t non_succ_get = 0, non_succ_put = 0; @@ -2714,7 +2719,7 @@ long do_tmem_op(tmem_cli_op_t uops) write_unlock(&tmem_rwlock); read_lock(&tmem_rwlock); - oidp = (struct oid *)&op.u.gen.oid[0]; + oidp = container_of(&op.u.gen.oid[0], struct xen_tmem_oid, oid[0]); switch ( op.cmd ) { case TMEM_NEW_POOL: diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index fc4709a..2d7580b 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -737,6 +737,12 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); #define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 #define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 +struct xen_tmem_oid { + uint64_t oid[3]; +}; +typedef struct xen_tmem_oid xen_tmem_oid_t; +DEFINE_XEN_GUEST_HANDLE(xen_tmem_oid_t); + struct xen_sysctl_tmem_op { uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ @@ -746,7 +752,7 @@ struct xen_sysctl_tmem_op { uint32_t arg1; /* IN: If not applicable to command use 0. */ uint32_t arg2; /* IN: If not applicable to command use 0. */ uint32_t pad; /* Padding so structure is the same under 32 and 64. */ - uint64_t oid[3]; /* IN: If not applicable to command use 0s. */ + xen_tmem_oid_t oid; /* IN: If not applicable to command use 0s. */ XEN_GUEST_HANDLE_64(char) buf; /* IN/OUT: Buffer to save and restore ops. */ }; typedef struct xen_sysctl_tmem_op xen_sysctl_tmem_op_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08: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 1ZZagq-0007jx-3a; Wed, 09 Sep 2015 08:25:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZago-0007jY-C6 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:10 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 6B/C7-25435-5ECEFE55; Wed, 09 Sep 2015 08:25:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1441787106!48119424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32558 invoked from network); 9 Sep 2015 08:25:08 -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; 9 Sep 2015 08:25:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagk-0008WO-3u for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagk-0001Eo-0z for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:06 +0000 Date: Wed, 09 Sep 2015 08:25:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Make the uint64_t oid[3] a proper structure: xen_tmem_oid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 987e64e05cc2e4a230ca364123d369dcc9a7b776 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 10:57:27 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:00 2015 -0400 tmem: Make the uint64_t oid[3] a proper structure: xen_tmem_oid And use it almost everywhere. It is easy to use it for the sysctl since the hypervisor and toolstack are intertwined. But for the tmem hypercall we need to be dilligient (as it is guest facing) so delaying that to another patch: "tmem: Use 'struct xen_tmem_oid' for every user" to help with bisection issues. We also move some of the parameters on functions to be within the right location. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jen Beulich --- tools/libxc/include/xenctrl.h | 6 +--- tools/libxc/xc_tmem.c | 16 +++++------ xen/common/tmem.c | 57 ++++++++++++++++++++++------------------ xen/include/public/sysctl.h | 8 +++++- 4 files changed, 46 insertions(+), 41 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 9e34769..2000f12 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2295,13 +2295,9 @@ int xc_disable_turbo(xc_interface *xch, int cpuid); * tmem operations */ -struct tmem_oid { - uint64_t oid[3]; -}; - int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, uint32_t subop, uint32_t cli_id, uint32_t arg1, uint32_t arg2, - struct tmem_oid oid, void *buf); + struct xen_tmem_oid oid, void *buf); int xc_tmem_control(xc_interface *xch, int32_t pool_id, uint32_t subop, uint32_t cli_id, uint32_t arg1, uint32_t arg2, void *buf); diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 505595b..558d2ea 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -64,9 +64,9 @@ int xc_tmem_control(xc_interface *xch, sysctl.u.tmem_op.arg1 = arg1; sysctl.u.tmem_op.arg2 = arg2; sysctl.u.tmem_op.pad = 0; - sysctl.u.tmem_op.oid[0] = 0; - sysctl.u.tmem_op.oid[1] = 0; - sysctl.u.tmem_op.oid[2] = 0; + sysctl.u.tmem_op.oid.oid[0] = 0; + sysctl.u.tmem_op.oid.oid[1] = 0; + sysctl.u.tmem_op.oid.oid[2] = 0; if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { @@ -98,7 +98,7 @@ int xc_tmem_control_oid(xc_interface *xch, uint32_t cli_id, uint32_t arg1, uint32_t arg2, - struct tmem_oid oid, + struct xen_tmem_oid oid, void *buf) { DECLARE_SYSCTL; @@ -112,9 +112,7 @@ int xc_tmem_control_oid(xc_interface *xch, sysctl.u.tmem_op.arg1 = arg1; sysctl.u.tmem_op.arg2 = arg2; sysctl.u.tmem_op.pad = 0; - sysctl.u.tmem_op.oid[0] = oid.oid[0]; - sysctl.u.tmem_op.oid[1] = oid.oid[1]; - sysctl.u.tmem_op.oid[2] = oid.oid[2]; + sysctl.u.tmem_op.oid = oid; if ( cmd == XEN_SYSCTL_TMEM_OP_LIST && arg1 != 0 ) { @@ -453,7 +451,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) } for ( j = n_pages; j > 0; j-- ) { - struct tmem_oid oid; + struct xen_tmem_oid oid; uint32_t index; int rc; if ( read_exact(io_fd, &oid, sizeof(oid)) ) @@ -487,7 +485,7 @@ int xc_tmem_restore(xc_interface *xch, int dom, int io_fd) int xc_tmem_restore_extra(xc_interface *xch, int dom, int io_fd) { uint32_t pool_id; - struct tmem_oid oid; + struct xen_tmem_oid oid; uint32_t index; int count = 0; int checksum = 0; diff --git a/xen/common/tmem.c b/xen/common/tmem.c index c73add5..5260c6c 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -125,12 +125,8 @@ struct tmem_pool { #define is_persistent(_p) (_p->persistent) #define is_shared(_p) (_p->shared) -struct oid { - uint64_t oid[3]; -}; - struct tmem_object_root { - struct oid oid; + struct xen_tmem_oid oid; struct rb_node rb_tree_node; /* protected by pool->pool_rwlock */ unsigned long objnode_count; /* atomicity depends on obj_spinlock */ long pgp_count; /* atomicity depends on obj_spinlock */ @@ -158,7 +154,7 @@ struct tmem_page_descriptor { }; struct tmem_object_root *obj; } us; - struct oid inv_oid; /* used for invalid list only */ + struct xen_tmem_oid inv_oid; /* used for invalid list only */ }; pagesize_t size; /* 0 == PAGE_SIZE (pfp), -1 == data invalid, else compressed data (cdata) */ @@ -815,7 +811,8 @@ static void rtn_free(struct radix_tree_node *rtn, void *arg) /************ POOL OBJECT COLLECTION MANIPULATION ROUTINES *******************/ -static int oid_compare(struct oid *left, struct oid *right) +static int oid_compare(struct xen_tmem_oid *left, + struct xen_tmem_oid *right) { if ( left->oid[2] == right->oid[2] ) { @@ -839,19 +836,20 @@ static int oid_compare(struct oid *left, struct oid *right) return 1; } -static void oid_set_invalid(struct oid *oidp) +static void oid_set_invalid(struct xen_tmem_oid *oidp) { oidp->oid[0] = oidp->oid[1] = oidp->oid[2] = -1UL; } -static unsigned oid_hash(struct oid *oidp) +static unsigned oid_hash(struct xen_tmem_oid *oidp) { return (tmem_hash(oidp->oid[0] ^ oidp->oid[1] ^ oidp->oid[2], BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } /* searches for object==oid in pool, returns locked object if found */ -static struct tmem_object_root * obj_find(struct tmem_pool *pool, struct oid *oidp) +static struct tmem_object_root * obj_find(struct tmem_pool *pool, + struct xen_tmem_oid *oidp) { struct rb_node *node; struct tmem_object_root *obj; @@ -887,7 +885,7 @@ restart_find: static void obj_free(struct tmem_object_root *obj) { struct tmem_pool *pool; - struct oid old_oid; + struct xen_tmem_oid old_oid; ASSERT_SPINLOCK(&obj->obj_spinlock); ASSERT(obj != NULL); @@ -946,7 +944,8 @@ static int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) * allocate, initialize, and insert an tmem_object_root * (should be called only if find failed) */ -static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, struct oid *oidp) +static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, + struct xen_tmem_oid *oidp) { struct tmem_object_root *obj; @@ -1531,8 +1530,8 @@ cleanup: } static int do_tmem_put(struct tmem_pool *pool, - struct oid *oidp, uint32_t index, - xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) + struct xen_tmem_oid *oidp, uint32_t index, + xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { struct tmem_object_root *obj = NULL; struct tmem_page_descriptor *pgp = NULL; @@ -1696,8 +1695,9 @@ unlock_obj: return ret; } -static int do_tmem_get(struct tmem_pool *pool, struct oid *oidp, uint32_t index, - xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) +static int do_tmem_get(struct tmem_pool *pool, + struct xen_tmem_oid *oidp, uint32_t index, + xen_pfn_t cmfn, tmem_cli_va_param_t clibuf) { struct tmem_object_root *obj; struct tmem_page_descriptor *pgp; @@ -1774,7 +1774,8 @@ bad_copy: return rc; } -static int do_tmem_flush_page(struct tmem_pool *pool, struct oid *oidp, uint32_t index) +static int do_tmem_flush_page(struct tmem_pool *pool, + struct xen_tmem_oid *oidp, uint32_t index) { struct tmem_object_root *obj; struct tmem_page_descriptor *pgp; @@ -1807,7 +1808,8 @@ out: return 1; } -static int do_tmem_flush_object(struct tmem_pool *pool, struct oid *oidp) +static int do_tmem_flush_object(struct tmem_pool *pool, + struct xen_tmem_oid *oidp) { struct tmem_object_root *obj; @@ -2432,7 +2434,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; struct tmem_page_descriptor *pgp; - struct oid oid; + struct xen_tmem_oid oid; int ret = 0; struct tmem_handle h; @@ -2525,8 +2527,10 @@ out: return ret; } -static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, struct oid *oidp, - uint32_t index, tmem_cli_va_param_t buf, uint32_t bufsize) +static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, + struct xen_tmem_oid *oidp, + uint32_t index, tmem_cli_va_param_t buf, + uint32_t bufsize) { struct client *client = tmem_client_from_cli_id(cli_id); struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) @@ -2542,8 +2546,9 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, struct oid *oidp return do_tmem_put(pool, oidp, index, 0, buf); } -static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, struct oid *oidp, - uint32_t index) +static int tmemc_restore_flush_page(int cli_id, uint32_t pool_id, + struct xen_tmem_oid *oidp, + uint32_t index) { struct client *client = tmem_client_from_cli_id(cli_id); struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) @@ -2559,7 +2564,7 @@ int tmem_control(struct xen_sysctl_tmem_op *op) int ret; uint32_t pool_id = op->pool_id; uint32_t cmd = op->cmd; - struct oid *oidp = (struct oid *)(&op->oid[0]); + struct xen_tmem_oid *oidp = &op->oid; if ( op->pad != 0 ) return -EINVAL; @@ -2633,7 +2638,7 @@ long do_tmem_op(tmem_cli_op_t uops) struct tmem_op op; struct client *client = current->domain->tmem_client; struct tmem_pool *pool = NULL; - struct oid *oidp; + struct xen_tmem_oid *oidp; int rc = 0; bool_t succ_get = 0, succ_put = 0; bool_t non_succ_get = 0, non_succ_put = 0; @@ -2714,7 +2719,7 @@ long do_tmem_op(tmem_cli_op_t uops) write_unlock(&tmem_rwlock); read_lock(&tmem_rwlock); - oidp = (struct oid *)&op.u.gen.oid[0]; + oidp = container_of(&op.u.gen.oid[0], struct xen_tmem_oid, oid[0]); switch ( op.cmd ) { case TMEM_NEW_POOL: diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index fc4709a..2d7580b 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -737,6 +737,12 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); #define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 #define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 +struct xen_tmem_oid { + uint64_t oid[3]; +}; +typedef struct xen_tmem_oid xen_tmem_oid_t; +DEFINE_XEN_GUEST_HANDLE(xen_tmem_oid_t); + struct xen_sysctl_tmem_op { uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ @@ -746,7 +752,7 @@ struct xen_sysctl_tmem_op { uint32_t arg1; /* IN: If not applicable to command use 0. */ uint32_t arg2; /* IN: If not applicable to command use 0. */ uint32_t pad; /* Padding so structure is the same under 32 and 64. */ - uint64_t oid[3]; /* IN: If not applicable to command use 0s. */ + xen_tmem_oid_t oid; /* IN: If not applicable to command use 0s. */ XEN_GUEST_HANDLE_64(char) buf; /* IN/OUT: Buffer to save and restore ops. */ }; typedef struct xen_sysctl_tmem_op xen_sysctl_tmem_op_t; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah0-0007lj-6u; Wed, 09 Sep 2015 08:25:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagz-0007lR-1U for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:21 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id C9/F3-19110-FECEFE55; Wed, 09 Sep 2015 08:25:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1441787116!48086360!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20906 invoked from network); 9 Sep 2015 08:25:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:25:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagu-0008WT-8X for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagu-0001FE-7O for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:16 +0000 Date: Wed, 09 Sep 2015 08:25:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Use 'struct xen_tmem_oid' for every user. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b657a8ad1fcb2363b379a84f1ac78e902f36c8a8 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 11:00:29 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:06 2015 -0400 tmem: Use 'struct xen_tmem_oid' for every user. Patch "tmem: Make the uint64_t oid[3] a proper structure: xen_tmem_oid" converted the sysctl API to use an proper structure. But it did not do it for the tmem hypercall. This expands that and converts the tmem hypercall. For this to work we define the struct in tmem.h and include it in sysctl.h. This change also included work to make the compat layer happy. That was to declare the struct xen_tmem_oid to be checked in xlat.lst - which will construct an typedef in the compat file with the same type, hence allowing copying of 'oid' member without type issues. The kicker is that the compat layer adds the prefix 'xen' and since our structure already has it - we must not include it. The layout (and size) of this structure in memory for the 'struct tmem_op' (so guest facing) is the same! Verified via pahole and with 32/64 bit guests. --- /tmp/old 2015-08-27 16:34:00.535638730 -0400 +++ /tmp/new 2015-08-27 16:34:10.447705328 -0400 @@ -8,7 +8,7 @@ uint32_t arg1; /* 28 4 */ } creat; /* 24 */ struct { - uint64_t oid[3]; /* 8 24 */ + xen_tmem_oid_t oid; /* 8 24 */ uint32_t index; /* 32 4 */ uint32_t tmem_offset; /* 36 4 */ uint32_t pfn_offset; /* 40 4 */ Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jen Beulich --- xen/common/compat/tmem_xen.c | 4 +--- xen/common/tmem.c | 2 +- xen/include/public/sysctl.h | 7 +------ xen/include/public/tmem.h | 9 +++++++++ xen/include/xlat.lst | 1 + 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/xen/common/compat/tmem_xen.c b/xen/common/compat/tmem_xen.c index 97c7ff2..db08005 100644 --- a/xen/common/compat/tmem_xen.c +++ b/xen/common/compat/tmem_xen.c @@ -11,9 +11,7 @@ #include #include -#define xen_tmem_op tmem_op -/*CHECK_tmem_op;*/ -#undef xen_tmem_op +CHECK_tmem_oid; /* * Local variables: diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 5260c6c..c5edab4 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2719,7 +2719,7 @@ long do_tmem_op(tmem_cli_op_t uops) write_unlock(&tmem_rwlock); read_lock(&tmem_rwlock); - oidp = container_of(&op.u.gen.oid[0], struct xen_tmem_oid, oid[0]); + oidp = &op.u.gen.oid; switch ( op.cmd ) { case TMEM_NEW_POOL: diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 2d7580b..3bdf0e1 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -34,6 +34,7 @@ #include "xen.h" #include "domctl.h" #include "physdev.h" +#include "tmem.h" #define XEN_SYSCTL_INTERFACE_VERSION 0x0000000C @@ -737,12 +738,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); #define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 #define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 -struct xen_tmem_oid { - uint64_t oid[3]; -}; -typedef struct xen_tmem_oid xen_tmem_oid_t; -DEFINE_XEN_GUEST_HANDLE(xen_tmem_oid_t); - struct xen_sysctl_tmem_op { uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index e4ee704..913566a 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -73,6 +73,11 @@ #define EFROZEN 1000 #define EEMPTY 1001 +struct xen_tmem_oid { + uint64_t oid[3]; +}; +typedef struct xen_tmem_oid xen_tmem_oid_t; +DEFINE_XEN_GUEST_HANDLE(xen_tmem_oid_t); #ifndef __ASSEMBLY__ #if __XEN_INTERFACE_VERSION__ < 0x00040400 @@ -89,7 +94,11 @@ struct tmem_op { uint32_t arg1; } creat; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */ struct { +#if __XEN_INTERFACE_VERSION__ < 0x00040600 uint64_t oid[3]; +#else + xen_tmem_oid_t oid; +#endif uint32_t index; uint32_t tmem_offset; uint32_t pfn_offset; diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 8cedee7..3795059 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -103,6 +103,7 @@ ! sched_poll sched.h ? sched_remote_shutdown sched.h ? sched_shutdown sched.h +? tmem_oid tmem.h ! tmem_op tmem.h ? t_buf trace.h ? vcpu_get_physid vcpu.h -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah0-0007lj-6u; Wed, 09 Sep 2015 08:25:22 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagz-0007lR-1U for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:21 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id C9/F3-19110-FECEFE55; Wed, 09 Sep 2015 08:25:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1441787116!48086360!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20906 invoked from network); 9 Sep 2015 08:25:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:25:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZagu-0008WT-8X for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZagu-0001FE-7O for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:16 +0000 Date: Wed, 09 Sep 2015 08:25:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Use 'struct xen_tmem_oid' for every user. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b657a8ad1fcb2363b379a84f1ac78e902f36c8a8 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 11:00:29 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:06 2015 -0400 tmem: Use 'struct xen_tmem_oid' for every user. Patch "tmem: Make the uint64_t oid[3] a proper structure: xen_tmem_oid" converted the sysctl API to use an proper structure. But it did not do it for the tmem hypercall. This expands that and converts the tmem hypercall. For this to work we define the struct in tmem.h and include it in sysctl.h. This change also included work to make the compat layer happy. That was to declare the struct xen_tmem_oid to be checked in xlat.lst - which will construct an typedef in the compat file with the same type, hence allowing copying of 'oid' member without type issues. The kicker is that the compat layer adds the prefix 'xen' and since our structure already has it - we must not include it. The layout (and size) of this structure in memory for the 'struct tmem_op' (so guest facing) is the same! Verified via pahole and with 32/64 bit guests. --- /tmp/old 2015-08-27 16:34:00.535638730 -0400 +++ /tmp/new 2015-08-27 16:34:10.447705328 -0400 @@ -8,7 +8,7 @@ uint32_t arg1; /* 28 4 */ } creat; /* 24 */ struct { - uint64_t oid[3]; /* 8 24 */ + xen_tmem_oid_t oid; /* 8 24 */ uint32_t index; /* 32 4 */ uint32_t tmem_offset; /* 36 4 */ uint32_t pfn_offset; /* 40 4 */ Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Jen Beulich --- xen/common/compat/tmem_xen.c | 4 +--- xen/common/tmem.c | 2 +- xen/include/public/sysctl.h | 7 +------ xen/include/public/tmem.h | 9 +++++++++ xen/include/xlat.lst | 1 + 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/xen/common/compat/tmem_xen.c b/xen/common/compat/tmem_xen.c index 97c7ff2..db08005 100644 --- a/xen/common/compat/tmem_xen.c +++ b/xen/common/compat/tmem_xen.c @@ -11,9 +11,7 @@ #include #include -#define xen_tmem_op tmem_op -/*CHECK_tmem_op;*/ -#undef xen_tmem_op +CHECK_tmem_oid; /* * Local variables: diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 5260c6c..c5edab4 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2719,7 +2719,7 @@ long do_tmem_op(tmem_cli_op_t uops) write_unlock(&tmem_rwlock); read_lock(&tmem_rwlock); - oidp = container_of(&op.u.gen.oid[0], struct xen_tmem_oid, oid[0]); + oidp = &op.u.gen.oid; switch ( op.cmd ) { case TMEM_NEW_POOL: diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 2d7580b..3bdf0e1 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -34,6 +34,7 @@ #include "xen.h" #include "domctl.h" #include "physdev.h" +#include "tmem.h" #define XEN_SYSCTL_INTERFACE_VERSION 0x0000000C @@ -737,12 +738,6 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); #define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 #define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 -struct xen_tmem_oid { - uint64_t oid[3]; -}; -typedef struct xen_tmem_oid xen_tmem_oid_t; -DEFINE_XEN_GUEST_HANDLE(xen_tmem_oid_t); - struct xen_sysctl_tmem_op { uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index e4ee704..913566a 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -73,6 +73,11 @@ #define EFROZEN 1000 #define EEMPTY 1001 +struct xen_tmem_oid { + uint64_t oid[3]; +}; +typedef struct xen_tmem_oid xen_tmem_oid_t; +DEFINE_XEN_GUEST_HANDLE(xen_tmem_oid_t); #ifndef __ASSEMBLY__ #if __XEN_INTERFACE_VERSION__ < 0x00040400 @@ -89,7 +94,11 @@ struct tmem_op { uint32_t arg1; } creat; /* for cmd == TMEM_NEW_POOL, TMEM_AUTH, TMEM_RESTORE_NEW */ struct { +#if __XEN_INTERFACE_VERSION__ < 0x00040600 uint64_t oid[3]; +#else + xen_tmem_oid_t oid; +#endif uint32_t index; uint32_t tmem_offset; uint32_t pfn_offset; diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 8cedee7..3795059 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -103,6 +103,7 @@ ! sched_poll sched.h ? sched_remote_shutdown sched.h ? sched_shutdown sched.h +? tmem_oid tmem.h ! tmem_op tmem.h ? t_buf trace.h ? vcpu_get_physid vcpu.h -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah9-0007n1-9Q; Wed, 09 Sep 2015 08:25:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah8-0007mv-EQ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:30 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 6E/ED-24856-9FCEFE55; Wed, 09 Sep 2015 08:25:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1441787126!28392603!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14900 invoked from network); 9 Sep 2015 08:25:27 -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; 9 Sep 2015 08:25:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah4-00005p-Gt for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZah4-0001Fe-Fg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:26 +0000 Date: Wed, 09 Sep 2015 08:25:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Use 'struct xen_tmem_oid' in tmem_handle and move it to sysctl header. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 880699a8bd4046b6cbd08a35949cbd1092db4248 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 11:13:50 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:12 2015 -0400 tmem: Use 'struct xen_tmem_oid' in tmem_handle and move it to sysctl header. Instead of the three member uint64_t structure. The structure is used by the control stack for XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_[PAGE|INV] only so moving it to the sysctl header. Also modified tmemc_save_get_next_page to deal with the new type - and converted some of the on-stack usage of the array to use an pointer. Further work will be to make the xen_sysctl_tmem_op have an union with proper type for the two: ..GET_NEXT_[PAGE|INV] operations. Signed-off-by: Konrad Rzeszutek Wilk --- tools/libxc/xc_tmem.c | 6 +++--- xen/common/tmem.c | 12 ++++++------ xen/include/public/sysctl.h | 11 +++++++++++ xen/include/public/tmem.h | 6 ------ 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 558d2ea..8f4c0cc 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -304,7 +304,7 @@ int xc_tmem_save(xc_interface *xch, } else { /* page list terminator */ h = (struct tmem_handle *)buf; - h->oid[0] = h->oid[1] = h->oid[2] = -1L; + h->oid.oid[0] = h->oid.oid[1] = h->oid.oid[2] = -1L; if ( write_exact(io_fd, &h->oid, sizeof(h->oid)) ) return -1; break; @@ -341,8 +341,8 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) if ( write_exact(io_fd, &handle.index, sizeof(handle.index)) ) return -1; count++; - checksum += handle.pool_id + handle.oid[0] + handle.oid[1] + - handle.oid[2] + handle.index; + checksum += handle.pool_id + handle.oid.oid[0] + handle.oid.oid[1] + + handle.oid.oid[2] + handle.index; } if ( count ) DPRINTF("needed %d tmem invalidates, check=%d\n",count,checksum); diff --git a/xen/common/tmem.c b/xen/common/tmem.c index c5edab4..e454259 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2434,7 +2434,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; struct tmem_page_descriptor *pgp; - struct xen_tmem_oid oid; + struct xen_tmem_oid *oid; int ret = 0; struct tmem_handle h; @@ -2466,10 +2466,10 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, pgp = list_entry((&pool->cur_pgp->us.pool_pers_pages)->next, struct tmem_page_descriptor,us.pool_pers_pages); pool->cur_pgp = pgp; - oid = pgp->us.obj->oid; + oid = &pgp->us.obj->oid; h.pool_id = pool_id; - BUILD_BUG_ON(sizeof(h.oid) != sizeof(oid)); - memcpy(h.oid, oid.oid, sizeof(h.oid)); + BUILD_BUG_ON(sizeof(h.oid) != sizeof(*oid)); + memcpy(&(h.oid), oid, sizeof(h.oid)); h.index = pgp->index; if ( copy_to_guest(guest_handle_cast(buf, void), &h, 1) ) { @@ -2477,7 +2477,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, goto out; } guest_handle_add_offset(buf, sizeof(h)); - ret = do_tmem_get(pool, &oid, pgp->index, 0, buf); + ret = do_tmem_get(pool, oid, pgp->index, 0, buf); out: spin_unlock(&pers_lists_spinlock); @@ -2517,7 +2517,7 @@ static int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, } h.pool_id = pgp->pool_id; BUILD_BUG_ON(sizeof(h.oid) != sizeof(pgp->inv_oid)); - memcpy(h.oid, pgp->inv_oid.oid, sizeof(h.oid)); + memcpy(&(h.oid), &(pgp->inv_oid), sizeof(h.oid)); h.index = pgp->index; ret = 1; if ( copy_to_guest(guest_handle_cast(buf, void), &h, 1) ) diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 3bdf0e1..0cacacc 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -738,6 +738,17 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); #define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 #define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 +/* + * XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_[PAGE|INV] override the 'buf' in + * xen_sysctl_tmem_op with this structure - sometimes with an extra + * page tackled on. + */ +struct tmem_handle { + uint32_t pool_id; + uint32_t index; + xen_tmem_oid_t oid; +}; + struct xen_sysctl_tmem_op { uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index 913566a..2d805fb 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -109,12 +109,6 @@ struct tmem_op { }; typedef struct tmem_op tmem_op_t; DEFINE_XEN_GUEST_HANDLE(tmem_op_t); - -struct tmem_handle { - uint32_t pool_id; - uint32_t index; - uint64_t oid[3]; -}; #endif #endif /* __XEN_PUBLIC_TMEM_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah9-0007n1-9Q; Wed, 09 Sep 2015 08:25:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah8-0007mv-EQ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:30 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 6E/ED-24856-9FCEFE55; Wed, 09 Sep 2015 08:25:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1441787126!28392603!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14900 invoked from network); 9 Sep 2015 08:25:27 -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; 9 Sep 2015 08:25:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZah4-00005p-Gt for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZah4-0001Fe-Fg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:26 +0000 Date: Wed, 09 Sep 2015 08:25:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Use 'struct xen_tmem_oid' in tmem_handle and move it to sysctl header. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 880699a8bd4046b6cbd08a35949cbd1092db4248 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 11:13:50 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:12 2015 -0400 tmem: Use 'struct xen_tmem_oid' in tmem_handle and move it to sysctl header. Instead of the three member uint64_t structure. The structure is used by the control stack for XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_[PAGE|INV] only so moving it to the sysctl header. Also modified tmemc_save_get_next_page to deal with the new type - and converted some of the on-stack usage of the array to use an pointer. Further work will be to make the xen_sysctl_tmem_op have an union with proper type for the two: ..GET_NEXT_[PAGE|INV] operations. Signed-off-by: Konrad Rzeszutek Wilk --- tools/libxc/xc_tmem.c | 6 +++--- xen/common/tmem.c | 12 ++++++------ xen/include/public/sysctl.h | 11 +++++++++++ xen/include/public/tmem.h | 6 ------ 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/tools/libxc/xc_tmem.c b/tools/libxc/xc_tmem.c index 558d2ea..8f4c0cc 100644 --- a/tools/libxc/xc_tmem.c +++ b/tools/libxc/xc_tmem.c @@ -304,7 +304,7 @@ int xc_tmem_save(xc_interface *xch, } else { /* page list terminator */ h = (struct tmem_handle *)buf; - h->oid[0] = h->oid[1] = h->oid[2] = -1L; + h->oid.oid[0] = h->oid.oid[1] = h->oid.oid[2] = -1L; if ( write_exact(io_fd, &h->oid, sizeof(h->oid)) ) return -1; break; @@ -341,8 +341,8 @@ int xc_tmem_save_extra(xc_interface *xch, int dom, int io_fd, int field_marker) if ( write_exact(io_fd, &handle.index, sizeof(handle.index)) ) return -1; count++; - checksum += handle.pool_id + handle.oid[0] + handle.oid[1] + - handle.oid[2] + handle.index; + checksum += handle.pool_id + handle.oid.oid[0] + handle.oid.oid[1] + + handle.oid.oid[2] + handle.index; } if ( count ) DPRINTF("needed %d tmem invalidates, check=%d\n",count,checksum); diff --git a/xen/common/tmem.c b/xen/common/tmem.c index c5edab4..e454259 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -2434,7 +2434,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, struct tmem_pool *pool = (client == NULL || pool_id >= MAX_POOLS_PER_DOMAIN) ? NULL : client->pools[pool_id]; struct tmem_page_descriptor *pgp; - struct xen_tmem_oid oid; + struct xen_tmem_oid *oid; int ret = 0; struct tmem_handle h; @@ -2466,10 +2466,10 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, pgp = list_entry((&pool->cur_pgp->us.pool_pers_pages)->next, struct tmem_page_descriptor,us.pool_pers_pages); pool->cur_pgp = pgp; - oid = pgp->us.obj->oid; + oid = &pgp->us.obj->oid; h.pool_id = pool_id; - BUILD_BUG_ON(sizeof(h.oid) != sizeof(oid)); - memcpy(h.oid, oid.oid, sizeof(h.oid)); + BUILD_BUG_ON(sizeof(h.oid) != sizeof(*oid)); + memcpy(&(h.oid), oid, sizeof(h.oid)); h.index = pgp->index; if ( copy_to_guest(guest_handle_cast(buf, void), &h, 1) ) { @@ -2477,7 +2477,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, goto out; } guest_handle_add_offset(buf, sizeof(h)); - ret = do_tmem_get(pool, &oid, pgp->index, 0, buf); + ret = do_tmem_get(pool, oid, pgp->index, 0, buf); out: spin_unlock(&pers_lists_spinlock); @@ -2517,7 +2517,7 @@ static int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, } h.pool_id = pgp->pool_id; BUILD_BUG_ON(sizeof(h.oid) != sizeof(pgp->inv_oid)); - memcpy(h.oid, pgp->inv_oid.oid, sizeof(h.oid)); + memcpy(&(h.oid), &(pgp->inv_oid), sizeof(h.oid)); h.index = pgp->index; ret = 1; if ( copy_to_guest(guest_handle_cast(buf, void), &h, 1) ) diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 3bdf0e1..0cacacc 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -738,6 +738,17 @@ DEFINE_XEN_GUEST_HANDLE(xen_sysctl_psr_cat_op_t); #define XEN_SYSCTL_TMEM_OP_RESTORE_PUT_PAGE 32 #define XEN_SYSCTL_TMEM_OP_RESTORE_FLUSH_PAGE 33 +/* + * XEN_SYSCTL_TMEM_OP_SAVE_GET_NEXT_[PAGE|INV] override the 'buf' in + * xen_sysctl_tmem_op with this structure - sometimes with an extra + * page tackled on. + */ +struct tmem_handle { + uint32_t pool_id; + uint32_t index; + xen_tmem_oid_t oid; +}; + struct xen_sysctl_tmem_op { uint32_t cmd; /* IN: XEN_SYSCTL_TMEM_OP_* . */ int32_t pool_id; /* IN: 0 by default unless _SAVE_*, RESTORE_* .*/ diff --git a/xen/include/public/tmem.h b/xen/include/public/tmem.h index 913566a..2d805fb 100644 --- a/xen/include/public/tmem.h +++ b/xen/include/public/tmem.h @@ -109,12 +109,6 @@ struct tmem_op { }; typedef struct tmem_op tmem_op_t; DEFINE_XEN_GUEST_HANDLE(tmem_op_t); - -struct tmem_handle { - uint32_t pool_id; - uint32_t index; - uint64_t oid[3]; -}; #endif #endif /* __XEN_PUBLIC_TMEM_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25: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 1ZZahI-0007ou-EC; Wed, 09 Sep 2015 08:25:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahH-0007oi-Bm for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:39 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 9C/06-19220-20DEFE55; Wed, 09 Sep 2015 08:25:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1441787136!29685924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26000 invoked from network); 9 Sep 2015 08:25:37 -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; 9 Sep 2015 08:25:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahE-00005x-NU for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahE-0001G4-KC for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:36 +0000 Date: Wed, 09 Sep 2015 08:25:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove extra spaces at end and some hard tabbing. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fee800b94233afc44340aed658c662150053cead Author: Konrad Rzeszutek Wilk AuthorDate: Fri Aug 21 10:48:25 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:12 2015 -0400 tmem: Remove extra spaces at end and some hard tabbing. My editor marks these in red glowing red so removing them to make it easier to focus on code. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- xen/common/tmem.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index e454259..331e52f 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -111,7 +111,7 @@ struct tmem_pool { atomic_t pgp_count; int pgp_count_max; long obj_count; /* atomicity depends on pool_rwlock held for write */ - long obj_count_max; + long obj_count_max; unsigned long objnode_count, objnode_count_max; uint64_t sum_life_cycles; uint64_t sum_evicted_cycles; @@ -1089,7 +1089,7 @@ static int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) ASSERT(is_shared(pool)); ASSERT(pool->client != NULL); - + ASSERT_WRITELOCK(&tmem_rwlock); pool_destroy_objs(pool, cli_id); list_for_each_entry(sl,&pool->share_list, share_list) @@ -1177,7 +1177,7 @@ static struct client *client_create(domid_t cli_id) } if ( !d->is_dying ) { d->tmem_client = client; - client->domain = d; + client->domain = d; } rcu_unlock_domain(d); @@ -1226,7 +1226,7 @@ static bool_t client_over_quota(struct client *client) int total = _atomic_read(client_weight_total); ASSERT(client != NULL); - if ( (total == 0) || (client->weight == 0) || + if ( (total == 0) || (client->weight == 0) || (client->eph_count == 0) ) return 0; return ( ((global_eph_count*100L) / client->eph_count ) > @@ -1411,7 +1411,7 @@ static int do_tmem_put_compress(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn void *dst, *p; size_t size; int ret = 0; - + ASSERT(pgp != NULL); ASSERT(pgp->us.obj != NULL); ASSERT_SPINLOCK(&pgp->us.obj->obj_spinlock); @@ -1556,7 +1556,7 @@ refind: { /* no puts allowed into a frozen pool (except dup puts) */ if ( client->frozen ) - goto unlock_obj; + goto unlock_obj; } } else @@ -1569,10 +1569,10 @@ refind: write_lock(&pool->pool_rwlock); /* - * Parallel callers may already allocated obj and inserted to obj_rb_root - * before us. - */ - if (!obj_rb_insert(&pool->obj_rb_root[oid_hash(oidp)], obj)) + * Parallel callers may already allocated obj and inserted to obj_rb_root + * before us. + */ + if ( !obj_rb_insert(&pool->obj_rb_root[oid_hash(oidp)], obj) ) { tmem_free(obj, pool); write_unlock(&pool->pool_rwlock); @@ -1945,7 +1945,7 @@ static int do_tmem_new_pool(domid_t this_cli_id, (client->shared_auth_uuid[i][1] == uuid_hi) ) break; if ( i == MAX_GLOBAL_SHARED_POOLS ) - { + { tmem_client_info("Shared auth failed, create non shared pool instead!\n"); pool->shared = 0; goto out; @@ -2107,7 +2107,7 @@ static int tmemc_list_client(struct client *c, tmem_cli_va_param_t buf, p->obj_count, p->obj_count_max, p->objnode_count, p->objnode_count_max, p->good_puts, p->puts,p->dup_puts_flushed, p->dup_puts_replaced, - p->no_mem_puts, + p->no_mem_puts, p->found_gets, p->gets, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) @@ -2146,7 +2146,7 @@ static int tmemc_list_shared(tmem_cli_va_param_t buf, int off, uint32_t len, p->obj_count, p->obj_count_max, p->objnode_count, p->objnode_count_max, p->good_puts, p->puts,p->dup_puts_flushed, p->dup_puts_replaced, - p->no_mem_puts, + p->no_mem_puts, p->found_gets, p->gets, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) @@ -2456,7 +2456,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, /* process the first one */ pool->cur_pgp = pgp = list_entry((&pool->persistent_page_list)->next, struct tmem_page_descriptor,us.pool_pers_pages); - } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, + } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, &pool->persistent_page_list) ) { /* already processed the last one in the list */ @@ -2504,7 +2504,7 @@ static int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, pgp = list_entry((&client->persistent_invalidated_list)->next, struct tmem_page_descriptor,client_inv_pages); client->cur_pgp = pgp; - } else if ( list_is_last(&client->cur_pgp->client_inv_pages, + } else if ( list_is_last(&client->cur_pgp->client_inv_pages, &client->persistent_invalidated_list) ) { client->cur_pgp = NULL; @@ -2541,7 +2541,7 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, if (bufsize != PAGE_SIZE) { tmem_client_err("tmem: %s: invalid parameter bufsize(%d) != (%ld)\n", __func__, bufsize, PAGE_SIZE); - return -EINVAL; + return -EINVAL; } return do_tmem_put(pool, oidp, index, 0, buf); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25: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 1ZZahI-0007ou-EC; Wed, 09 Sep 2015 08:25:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahH-0007oi-Bm for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:39 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 9C/06-19220-20DEFE55; Wed, 09 Sep 2015 08:25:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1441787136!29685924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26000 invoked from network); 9 Sep 2015 08:25:37 -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; 9 Sep 2015 08:25:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahE-00005x-NU for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahE-0001G4-KC for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:36 +0000 Date: Wed, 09 Sep 2015 08:25:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Remove extra spaces at end and some hard tabbing. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fee800b94233afc44340aed658c662150053cead Author: Konrad Rzeszutek Wilk AuthorDate: Fri Aug 21 10:48:25 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:12 2015 -0400 tmem: Remove extra spaces at end and some hard tabbing. My editor marks these in red glowing red so removing them to make it easier to focus on code. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- xen/common/tmem.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index e454259..331e52f 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -111,7 +111,7 @@ struct tmem_pool { atomic_t pgp_count; int pgp_count_max; long obj_count; /* atomicity depends on pool_rwlock held for write */ - long obj_count_max; + long obj_count_max; unsigned long objnode_count, objnode_count_max; uint64_t sum_life_cycles; uint64_t sum_evicted_cycles; @@ -1089,7 +1089,7 @@ static int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) ASSERT(is_shared(pool)); ASSERT(pool->client != NULL); - + ASSERT_WRITELOCK(&tmem_rwlock); pool_destroy_objs(pool, cli_id); list_for_each_entry(sl,&pool->share_list, share_list) @@ -1177,7 +1177,7 @@ static struct client *client_create(domid_t cli_id) } if ( !d->is_dying ) { d->tmem_client = client; - client->domain = d; + client->domain = d; } rcu_unlock_domain(d); @@ -1226,7 +1226,7 @@ static bool_t client_over_quota(struct client *client) int total = _atomic_read(client_weight_total); ASSERT(client != NULL); - if ( (total == 0) || (client->weight == 0) || + if ( (total == 0) || (client->weight == 0) || (client->eph_count == 0) ) return 0; return ( ((global_eph_count*100L) / client->eph_count ) > @@ -1411,7 +1411,7 @@ static int do_tmem_put_compress(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn void *dst, *p; size_t size; int ret = 0; - + ASSERT(pgp != NULL); ASSERT(pgp->us.obj != NULL); ASSERT_SPINLOCK(&pgp->us.obj->obj_spinlock); @@ -1556,7 +1556,7 @@ refind: { /* no puts allowed into a frozen pool (except dup puts) */ if ( client->frozen ) - goto unlock_obj; + goto unlock_obj; } } else @@ -1569,10 +1569,10 @@ refind: write_lock(&pool->pool_rwlock); /* - * Parallel callers may already allocated obj and inserted to obj_rb_root - * before us. - */ - if (!obj_rb_insert(&pool->obj_rb_root[oid_hash(oidp)], obj)) + * Parallel callers may already allocated obj and inserted to obj_rb_root + * before us. + */ + if ( !obj_rb_insert(&pool->obj_rb_root[oid_hash(oidp)], obj) ) { tmem_free(obj, pool); write_unlock(&pool->pool_rwlock); @@ -1945,7 +1945,7 @@ static int do_tmem_new_pool(domid_t this_cli_id, (client->shared_auth_uuid[i][1] == uuid_hi) ) break; if ( i == MAX_GLOBAL_SHARED_POOLS ) - { + { tmem_client_info("Shared auth failed, create non shared pool instead!\n"); pool->shared = 0; goto out; @@ -2107,7 +2107,7 @@ static int tmemc_list_client(struct client *c, tmem_cli_va_param_t buf, p->obj_count, p->obj_count_max, p->objnode_count, p->objnode_count_max, p->good_puts, p->puts,p->dup_puts_flushed, p->dup_puts_replaced, - p->no_mem_puts, + p->no_mem_puts, p->found_gets, p->gets, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) @@ -2146,7 +2146,7 @@ static int tmemc_list_shared(tmem_cli_va_param_t buf, int off, uint32_t len, p->obj_count, p->obj_count_max, p->objnode_count, p->objnode_count_max, p->good_puts, p->puts,p->dup_puts_flushed, p->dup_puts_replaced, - p->no_mem_puts, + p->no_mem_puts, p->found_gets, p->gets, p->flushs_found, p->flushs, p->flush_objs_found, p->flush_objs); if ( sum + n >= len ) @@ -2456,7 +2456,7 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, /* process the first one */ pool->cur_pgp = pgp = list_entry((&pool->persistent_page_list)->next, struct tmem_page_descriptor,us.pool_pers_pages); - } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, + } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, &pool->persistent_page_list) ) { /* already processed the last one in the list */ @@ -2504,7 +2504,7 @@ static int tmemc_save_get_next_inv(int cli_id, tmem_cli_va_param_t buf, pgp = list_entry((&client->persistent_invalidated_list)->next, struct tmem_page_descriptor,client_inv_pages); client->cur_pgp = pgp; - } else if ( list_is_last(&client->cur_pgp->client_inv_pages, + } else if ( list_is_last(&client->cur_pgp->client_inv_pages, &client->persistent_invalidated_list) ) { client->cur_pgp = NULL; @@ -2541,7 +2541,7 @@ static int tmemc_restore_put_page(int cli_id, uint32_t pool_id, if (bufsize != PAGE_SIZE) { tmem_client_err("tmem: %s: invalid parameter bufsize(%d) != (%ld)\n", __func__, bufsize, PAGE_SIZE); - return -EINVAL; + return -EINVAL; } return do_tmem_put(pool, oidp, index, 0, buf); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahU-0007qb-Gw; Wed, 09 Sep 2015 08:25:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahS-0007qP-V8 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:52 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 01/77-28221-D0DEFE55; Wed, 09 Sep 2015 08:25:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1441787147!48057859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21195 invoked from network); 9 Sep 2015 08:25:47 -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; 9 Sep 2015 08:25:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahO-000066-Se for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahO-0001GU-Qg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:46 +0000 Date: Wed, 09 Sep 2015 08:25:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Spelling and full stop surgery. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 076cd50657516fd265107101b0a8385e487fc304 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 11:14:14 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:13 2015 -0400 tmem: Spelling and full stop surgery. I could not help myself. Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 234 +++++++++++++++++++++++++++------------------------- 1 files changed, 121 insertions(+), 113 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 331e52f..0436e49 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -15,7 +15,7 @@ */ #ifdef __XEN__ -#include /* host-specific (eg Xen) code goes here */ +#include /* host-specific (eg Xen) code goes here. */ #endif #include @@ -27,7 +27,7 @@ #define TMEM_SPEC_VERSION 1 -/* global statistics (none need to be locked) */ +/* Global statistics (none need to be locked). */ static unsigned long total_tmem_ops = 0; static unsigned long errored_tmem_ops = 0; static unsigned long total_flush_pool = 0; @@ -69,18 +69,18 @@ struct client { bool_t compress; bool_t frozen; bool_t shared_auth_required; - /* for save/restore/migration */ + /* For save/restore/migration. */ bool_t live_migrating; bool_t was_frozen; struct list_head persistent_invalidated_list; struct tmem_page_descriptor *cur_pgp; - /* statistics collection */ + /* Statistics collection. */ unsigned long compress_poor, compress_nomem; unsigned long compressed_pages; uint64_t compressed_sum_size; uint64_t total_cycles; unsigned long succ_pers_puts, succ_eph_gets, succ_pers_gets; - /* shared pool authentication */ + /* Shared pool authentication. */ uint64_t shared_auth_uuid[MAX_GLOBAL_SHARED_POOLS][2]; }; @@ -90,7 +90,7 @@ struct share_list { }; #define POOL_PAGESHIFT (PAGE_SHIFT - 12) -#define OBJ_HASH_BUCKETS 256 /* must be power of two */ +#define OBJ_HASH_BUCKETS 256 /* Must be power of two. */ #define OBJ_HASH_BUCKETS_MASK (OBJ_HASH_BUCKETS-1) struct tmem_pool { @@ -98,19 +98,19 @@ struct tmem_pool { bool_t persistent; bool_t is_dying; struct client *client; - uint64_t uuid[2]; /* 0 for private, non-zero for shared */ + uint64_t uuid[2]; /* 0 for private, non-zero for shared. */ uint32_t pool_id; rwlock_t pool_rwlock; - struct rb_root obj_rb_root[OBJ_HASH_BUCKETS]; /* protected by pool_rwlock */ - struct list_head share_list; /* valid if shared */ - int shared_count; /* valid if shared */ - /* for save/restore/migration */ + struct rb_root obj_rb_root[OBJ_HASH_BUCKETS]; /* Protected by pool_rwlock. */ + struct list_head share_list; /* Valid if shared. */ + int shared_count; /* Valid if shared. */ + /* For save/restore/migration. */ struct list_head persistent_page_list; struct tmem_page_descriptor *cur_pgp; - /* statistics collection */ + /* Statistics collection. */ atomic_t pgp_count; int pgp_count_max; - long obj_count; /* atomicity depends on pool_rwlock held for write */ + long obj_count; /* Atomicity depends on pool_rwlock held for write. */ long obj_count_max; unsigned long objnode_count, objnode_count_max; uint64_t sum_life_cycles; @@ -127,10 +127,10 @@ struct tmem_pool { struct tmem_object_root { struct xen_tmem_oid oid; - struct rb_node rb_tree_node; /* protected by pool->pool_rwlock */ - unsigned long objnode_count; /* atomicity depends on obj_spinlock */ - long pgp_count; /* atomicity depends on obj_spinlock */ - struct radix_tree_root tree_root; /* tree of pages within object */ + struct rb_node rb_tree_node; /* Protected by pool->pool_rwlock. */ + unsigned long objnode_count; /* Atomicity depends on obj_spinlock. */ + long pgp_count; /* Atomicity depends on obj_spinlock. */ + struct radix_tree_root tree_root; /* Tree of pages within object. */ struct tmem_pool *pool; domid_t last_client; spinlock_t obj_spinlock; @@ -154,23 +154,23 @@ struct tmem_page_descriptor { }; struct tmem_object_root *obj; } us; - struct xen_tmem_oid inv_oid; /* used for invalid list only */ + struct xen_tmem_oid inv_oid; /* Used for invalid list only. */ }; pagesize_t size; /* 0 == PAGE_SIZE (pfp), -1 == data invalid, - else compressed data (cdata) */ + else compressed data (cdata). */ uint32_t index; - /* must hold pcd_tree_rwlocks[firstbyte] to use pcd pointer/siblings */ - uint16_t firstbyte; /* NON_SHAREABLE->pfp otherwise->pcd */ - bool_t eviction_attempted; /* CHANGE TO lifetimes? (settable) */ + /* Must hold pcd_tree_rwlocks[firstbyte] to use pcd pointer/siblings. */ + uint16_t firstbyte; /* NON_SHAREABLE->pfp otherwise->pcd. */ + bool_t eviction_attempted; /* CHANGE TO lifetimes? (settable). */ struct list_head pcd_siblings; union { - struct page_info *pfp; /* page frame pointer */ - char *cdata; /* compressed data */ - struct tmem_page_content_descriptor *pcd; /* page dedup */ + struct page_info *pfp; /* Page frame pointer. */ + char *cdata; /* Compressed data. */ + struct tmem_page_content_descriptor *pcd; /* Page dedup. */ }; union { uint64_t timestamp; - uint32_t pool_id; /* used for invalid list only */ + uint32_t pool_id; /* Used for invalid list only. */ }; }; @@ -178,21 +178,21 @@ struct tmem_page_descriptor { struct tmem_page_content_descriptor { union { - struct page_info *pfp; /* page frame pointer */ - char *cdata; /* if compression_enabled */ - char *tze; /* if !compression_enabled, trailing zeroes eliminated */ + struct page_info *pfp; /* Page frame pointer. */ + char *cdata; /* If compression_enabled. */ + char *tze; /* If !compression_enabled, trailing zeroes eliminated. */ }; struct list_head pgp_list; struct rb_node pcd_rb_tree_node; uint32_t pgp_ref_count; - pagesize_t size; /* if compression_enabled -> 0 0 *pfp */ + * else PAGE_SIZE -> *pfp. */ }; -struct rb_root pcd_tree_roots[256]; /* choose based on first byte of page */ -rwlock_t pcd_tree_rwlocks[256]; /* poor man's concurrency for now */ +struct rb_root pcd_tree_roots[256]; /* Choose based on first byte of page. */ +rwlock_t pcd_tree_rwlocks[256]; /* Poor man's concurrency for now. */ -static LIST_HEAD(global_ephemeral_page_list); /* all pages in ephemeral pools */ +static LIST_HEAD(global_ephemeral_page_list); /* All pages in ephemeral pools. */ static LIST_HEAD(global_client_list); @@ -209,14 +209,14 @@ PAGE_LIST_HEAD(tmem_page_list); unsigned long tmem_page_list_pages = 0; DEFINE_RWLOCK(tmem_rwlock); -static DEFINE_SPINLOCK(eph_lists_spinlock); /* protects global AND clients */ +static DEFINE_SPINLOCK(eph_lists_spinlock); /* Protects global AND clients. */ static DEFINE_SPINLOCK(pers_lists_spinlock); #define ASSERT_SPINLOCK(_l) ASSERT(spin_is_locked(_l)) #define ASSERT_WRITELOCK(_l) ASSERT(rw_is_write_locked(_l)) -/* global counters (should use long_atomic_t access) */ -static long global_eph_count = 0; /* atomicity depends on eph_lists_spinlock */ +/* Global counters (should use long_atomic_t access). */ +static long global_eph_count = 0; /* Atomicity depends on eph_lists_spinlock. */ static atomic_t global_obj_count = ATOMIC_INIT(0); static atomic_t global_pgp_count = ATOMIC_INIT(0); static atomic_t global_pcd_count = ATOMIC_INIT(0); @@ -341,7 +341,7 @@ static int __init tmem_mempool_init(void) return tmem_mempool != NULL; } -/* persistent pools are per-domain */ +/* Persistent pools are per-domain. */ static void *tmem_persistent_pool_page_get(unsigned long size) { struct page_info *pi; @@ -365,7 +365,7 @@ static void tmem_persistent_pool_page_put(void *page_va) } /* - * Page content descriptor manipulation routines + * Page content descriptor manipulation routines. */ #define NOT_SHAREABLE ((uint16_t)-1UL) @@ -390,8 +390,10 @@ static int pcd_copy_to_client(xen_pfn_t cmfn, struct tmem_page_descriptor *pgp) return ret; } -/* ensure pgp no longer points to pcd, nor vice-versa */ -/* take pcd rwlock unless have_pcd_rwlock is set, always unlock when done */ +/* + * Ensure pgp no longer points to pcd, nor vice-versa. + * Take pcd rwlock unless have_pcd_rwlock is set, always unlock when done. + */ static void pcd_disassociate(struct tmem_page_descriptor *pgp, struct tmem_pool *pool, bool_t have_pcd_rwlock) { struct tmem_page_content_descriptor *pcd = pgp->pcd; @@ -421,30 +423,30 @@ static void pcd_disassociate(struct tmem_page_descriptor *pgp, struct tmem_pool return; } - /* no more references to this pcd, recycle it and the physical page */ + /* No more references to this pcd, recycle it and the physical page. */ ASSERT(list_empty(&pcd->pgp_list)); pcd->pfp = NULL; - /* remove pcd from rbtree */ + /* Remove pcd from rbtree. */ rb_erase(&pcd->pcd_rb_tree_node,&pcd_tree_roots[firstbyte]); - /* reinit the struct for safety for now */ + /* Reinit the struct for safety for now. */ RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); - /* now free up the pcd memory */ + /* Now free up the pcd memory. */ tmem_free(pcd, NULL); atomic_dec_and_assert(global_pcd_count); if ( pgp_size != 0 && pcd_size < PAGE_SIZE ) { - /* compressed data */ + /* Compressed data. */ tmem_free(pcd_cdata, pool); pcd_tot_csize -= pcd_csize; } else if ( pcd_size != PAGE_SIZE ) { - /* trailing zero data */ + /* Trailing zero data. */ pcd_tot_tze_size -= pcd_size; if ( pcd_size ) tmem_free(pcd_tze, pool); } else { - /* real physical page */ + /* Real physical page. */ if ( tmem_tze_enabled() ) pcd_tot_tze_size -= PAGE_SIZE; if ( tmem_compression_enabled() ) @@ -485,48 +487,50 @@ static int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize } write_lock(&pcd_tree_rwlocks[firstbyte]); - /* look for page match */ + /* Look for page match. */ root = &pcd_tree_roots[firstbyte]; new = &(root->rb_node); while ( *new ) { pcd = container_of(*new, struct tmem_page_content_descriptor, pcd_rb_tree_node); parent = *new; - /* compare new entry and rbtree entry, set cmp accordingly */ + /* Compare new entry and rbtree entry, set cmp accordingly. */ if ( cdata != NULL ) { if ( pcd->size < PAGE_SIZE ) - /* both new entry and rbtree entry are compressed */ + /* Both new entry and rbtree entry are compressed. */ cmp = tmem_pcd_cmp(cdata,csize,pcd->cdata,pcd->size); else - /* new entry is compressed, rbtree entry is not */ + /* New entry is compressed, rbtree entry is not. */ cmp = -1; } else if ( pcd->size < PAGE_SIZE ) - /* rbtree entry is compressed, rbtree entry is not */ + /* Rbtree entry is compressed, rbtree entry is not. */ cmp = 1; else if ( tmem_tze_enabled() ) { if ( pcd->size < PAGE_SIZE ) - /* both new entry and rbtree entry are trailing zero */ + /* Both new entry and rbtree entry are trailing zero. */ cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->tze,pcd->size); else - /* new entry is trailing zero, rbtree entry is not */ + /* New entry is trailing zero, rbtree entry is not. */ cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->pfp,PAGE_SIZE); } else { - /* both new entry and rbtree entry are full physical pages */ + /* Both new entry and rbtree entry are full physical pages. */ ASSERT(pgp->pfp != NULL); ASSERT(pcd->pfp != NULL); cmp = tmem_page_cmp(pgp->pfp,pcd->pfp); } - /* walk tree or match depending on cmp */ + /* Walk tree or match depending on cmp. */ if ( cmp < 0 ) new = &((*new)->rb_left); else if ( cmp > 0 ) new = &((*new)->rb_right); else { - /* match! if not compressed, free the no-longer-needed page */ - /* but if compressed, data is assumed static so don't free! */ + /* + * Match! if not compressed, free the no-longer-needed page + * but if compressed, data is assumed static so don't free! + */ if ( cdata == NULL ) tmem_free_page(pgp->us.obj->pool,pgp->pfp); deduped_puts++; @@ -534,7 +538,7 @@ static int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize } } - /* exited while loop with no match, so alloc a pcd and put it in the tree */ + /* Exited while loop with no match, so alloc a pcd and put it in the tree. */ if ( (pcd = tmem_malloc(sizeof(struct tmem_page_content_descriptor), NULL)) == NULL ) { ret = -ENOMEM; @@ -548,8 +552,8 @@ static int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize } } atomic_inc_and_max(global_pcd_count); - RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* is this necessary */ - INIT_LIST_HEAD(&pcd->pgp_list); /* is this necessary */ + RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* Is this necessary? */ + INIT_LIST_HEAD(&pcd->pgp_list); /* Is this necessary? */ pcd->pgp_ref_count = 0; if ( cdata != NULL ) { @@ -591,7 +595,7 @@ unlock: /************ PAGE DESCRIPTOR MANIPULATION ROUTINES *******************/ -/* allocate a struct tmem_page_descriptor and associate it with an object */ +/* Allocate a struct tmem_page_descriptor and associate it with an object. */ static struct tmem_page_descriptor *pgp_alloc(struct tmem_object_root *obj) { struct tmem_page_descriptor *pgp; @@ -635,7 +639,7 @@ static void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem_pool *po if ( pgp->pfp == NULL ) return; if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) - pcd_disassociate(pgp,pool,0); /* pgp->size lost */ + pcd_disassociate(pgp,pool,0); /* pgp->size lost. */ else if ( pgp_size ) tmem_free(pgp->cdata, pool); else @@ -683,7 +687,7 @@ static void pgp_free(struct tmem_page_descriptor *pgp) __pgp_free(pgp, pool); } -/* remove pgp from global/pool/client lists and free it */ +/* Remove pgp from global/pool/client lists and free it. */ static void pgp_delist_free(struct tmem_page_descriptor *pgp) { struct client *client; @@ -695,7 +699,7 @@ static void pgp_delist_free(struct tmem_page_descriptor *pgp) client = pgp->us.obj->pool->client; ASSERT(client != NULL); - /* Delist pgp */ + /* Delist pgp. */ if ( !is_persistent(pgp->us.obj->pool) ) { spin_lock(&eph_lists_spinlock); @@ -730,11 +734,11 @@ static void pgp_delist_free(struct tmem_page_descriptor *pgp) life = get_cycles() - pgp->timestamp; pgp->us.obj->pool->sum_life_cycles += life; - /* free pgp */ + /* Free pgp. */ pgp_free(pgp); } -/* called only indirectly by radix_tree_destroy */ +/* Called only indirectly by radix_tree_destroy. */ static void pgp_destroy(void *v) { struct tmem_page_descriptor *pgp = (struct tmem_page_descriptor *)v; @@ -771,7 +775,7 @@ static struct tmem_page_descriptor *pgp_delete_from_obj(struct tmem_object_root /************ RADIX TREE NODE MANIPULATION ROUTINES *******************/ -/* called only indirectly from radix_tree_insert */ +/* Called only indirectly from radix_tree_insert. */ static struct radix_tree_node *rtn_alloc(void *arg) { struct tmem_object_node *objnode; @@ -790,7 +794,7 @@ static struct radix_tree_node *rtn_alloc(void *arg) return &objnode->rtn; } -/* called only indirectly from radix_tree_delete/destroy */ +/* Called only indirectly from radix_tree_delete/destroy. */ static void rtn_free(struct radix_tree_node *rtn, void *arg) { struct tmem_pool *pool; @@ -847,7 +851,7 @@ static unsigned oid_hash(struct xen_tmem_oid *oidp) BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } -/* searches for object==oid in pool, returns locked object if found */ +/* Searches for object==oid in pool, returns locked object if found. */ static struct tmem_object_root * obj_find(struct tmem_pool *pool, struct xen_tmem_oid *oidp) { @@ -862,7 +866,7 @@ restart_find: obj = container_of(node, struct tmem_object_root, rb_tree_node); switch ( oid_compare(&obj->oid, oidp) ) { - case 0: /* equal */ + case 0: /* Equal. */ if ( !spin_trylock(&obj->obj_spinlock) ) { read_unlock(&pool->pool_rwlock); @@ -881,7 +885,7 @@ restart_find: return NULL; } -/* free an object that has no more pgps in it */ +/* Free an object that has no more pgps in it. */ static void obj_free(struct tmem_object_root *obj) { struct tmem_pool *pool; @@ -894,7 +898,7 @@ static void obj_free(struct tmem_object_root *obj) ASSERT(pool != NULL); ASSERT(pool->client != NULL); ASSERT_WRITELOCK(&pool->pool_rwlock); - if ( obj->tree_root.rnode != NULL ) /* may be a "stump" with no leaves */ + if ( obj->tree_root.rnode != NULL ) /* May be a "stump" with no leaves. */ radix_tree_destroy(&obj->tree_root, pgp_destroy); ASSERT((long)obj->objnode_count == 0); ASSERT(obj->tree_root.rnode == NULL); @@ -941,8 +945,8 @@ static int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) } /* - * allocate, initialize, and insert an tmem_object_root - * (should be called only if find failed) + * Allocate, initialize, and insert an tmem_object_root + * (should be called only if find failed). */ static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, struct xen_tmem_oid *oidp) @@ -967,7 +971,7 @@ static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, return obj; } -/* free an object after destroying any pgps in it */ +/* Free an object after destroying any pgps in it. */ static void obj_destroy(struct tmem_object_root *obj) { ASSERT_WRITELOCK(&obj->pool->pool_rwlock); @@ -975,7 +979,7 @@ static void obj_destroy(struct tmem_object_root *obj) obj_free(obj); } -/* destroys all objs in a pool, or only if obj->last_client matches cli_id */ +/* Destroys all objs in a pool, or only if obj->last_client matches cli_id. */ static void pool_destroy_objs(struct tmem_pool *pool, domid_t cli_id) { struct rb_node *node; @@ -1047,7 +1051,7 @@ static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) return 0; } -/* reassign "ownership" of the pool to another client that shares this pool */ +/* Reassign "ownership" of the pool to another client that shares this pool. */ static void shared_pool_reassign(struct tmem_pool *pool) { struct share_list *sl; @@ -1080,8 +1084,10 @@ static void shared_pool_reassign(struct tmem_pool *pool) pool->pool_id = poolid; } -/* destroy all objects with last_client same as passed cli_id, - remove pool's cli_id from list of sharers of this pool */ +/* + * Destroy all objects with last_client same as passed cli_id, + * remove pool's cli_id from list of sharers of this pool. + */ static int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) { struct share_list *sl; @@ -1116,7 +1122,7 @@ static int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) return -1; } -/* flush all data (owned by cli_id) from a pool and, optionally, free it */ +/* Flush all data (owned by cli_id) from a pool and, optionally, free it. */ static void pool_flush(struct tmem_pool *pool, domid_t cli_id) { ASSERT(pool != NULL); @@ -1205,7 +1211,7 @@ static void client_free(struct client *client) xfree(client); } -/* flush all data from a client and, optionally, free it */ +/* Flush all data from a client and, optionally, free it. */ static void client_flush(struct client *client) { int i; @@ -1307,12 +1313,12 @@ static int tmem_evict(void) goto found; } } - /* global_ephemeral_page_list is empty, so we bail out. */ + /* Global_ephemeral_page_list is empty, so we bail out. */ spin_unlock(&eph_lists_spinlock); goto out; found: - /* Delist */ + /* Delist. */ list_del_init(&pgp->us.client_eph_pages); client->eph_count--; list_del_init(&pgp->global_eph_pages); @@ -1336,7 +1342,7 @@ found: pcd_disassociate(pgp,pool,1); } - /* pgp already delist, so call pgp_free directly */ + /* pgp already delist, so call pgp_free directly. */ pgp_free(pgp); if ( obj->pgp_count == 0 ) { @@ -1464,8 +1470,8 @@ static int do_tmem_dup_put(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn, ASSERT(pool != NULL); client = pool->client; if ( client->live_migrating ) - goto failed_dup; /* no dups allowed when migrating */ - /* can we successfully manipulate pgp to change out the data? */ + goto failed_dup; /* No dups allowed when migrating. */ + /* Can we successfully manipulate pgp to change out the data? */ if ( client->compress && pgp->size != 0 ) { ret = do_tmem_put_compress(pgp, cmfn, clibuf); @@ -1495,7 +1501,7 @@ copy_uncompressed: } done: - /* successfully replaced data, clean up and return success */ + /* Successfully replaced data, clean up and return success. */ if ( is_shared(pool) ) obj->last_client = client->cli_id; spin_unlock(&obj->obj_spinlock); @@ -1510,8 +1516,10 @@ bad_copy: goto cleanup; failed_dup: - /* couldn't change out the data, flush the old data and return - * -ENOSPC instead of -ENOMEM to differentiate failed _dup_ put */ + /* + * Couldn't change out the data, flush the old data and return + * -ENOSPC instead of -ENOMEM to differentiate failed _dup_ put. + */ ret = -ENOSPC; cleanup: pgpfound = pgp_delete_from_obj(obj, pgp->index); @@ -1545,7 +1553,7 @@ static int do_tmem_put(struct tmem_pool *pool, pool->puts++; refind: - /* does page already exist (dup)? if so, handle specially */ + /* Does page already exist (dup)? if so, handle specially. */ if ( (obj = obj_find(pool, oidp)) != NULL ) { if ((pgp = pgp_lookup_in_obj(obj, index)) != NULL) @@ -1554,14 +1562,14 @@ refind: } else { - /* no puts allowed into a frozen pool (except dup puts) */ + /* No puts allowed into a frozen pool (except dup puts). */ if ( client->frozen ) goto unlock_obj; } } else { - /* no puts allowed into a frozen pool (except dup puts) */ + /* No puts allowed into a frozen pool (except dup puts). */ if ( client->frozen ) return ret; if ( (obj = obj_alloc(pool, oidp)) == NULL ) @@ -1584,14 +1592,14 @@ refind: write_unlock(&pool->pool_rwlock); } - /* When arrive here, we have a spinlocked obj for use */ + /* When arrive here, we have a spinlocked obj for use. */ ASSERT_SPINLOCK(&obj->obj_spinlock); if ( (pgp = pgp_alloc(obj)) == NULL ) goto unlock_obj; ret = pgp_add_to_obj(obj, index, pgp); if ( ret == -ENOMEM ) - /* warning, may result in partially built radix tree ("stump") */ + /* Warning: may result in partially built radix tree ("stump"). */ goto free_pgp; pgp->index = index; @@ -1651,7 +1659,7 @@ insert_page: spin_unlock(&eph_lists_spinlock); } else - { /* is_persistent */ + { /* is_persistent. */ spin_lock(&pers_lists_spinlock); list_add_tail(&pgp->us.pool_pers_pages, &pool->persistent_page_list); @@ -1661,7 +1669,7 @@ insert_page: if ( is_shared(pool) ) obj->last_client = client->cli_id; - /* free the obj spinlock */ + /* Free the obj spinlock. */ spin_unlock(&obj->obj_spinlock); pool->good_puts++; @@ -1954,7 +1962,7 @@ static int do_tmem_new_pool(domid_t this_cli_id, /* * Authorize okay, match a global shared pool or use the newly allocated - * one + * one. */ first_unused_s_poolid = MAX_GLOBAL_SHARED_POOLS; for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++ ) @@ -1963,7 +1971,7 @@ static int do_tmem_new_pool(domid_t this_cli_id, { if ( shpool->uuid[0] == uuid_lo && shpool->uuid[1] == uuid_hi ) { - /* Succ to match a global shared pool */ + /* Succ to match a global shared pool. */ tmem_client_info("(matches shared pool uuid=%"PRIx64".%"PRIx64") pool_id=%d\n", uuid_hi, uuid_lo, d_poolid); client->pools[d_poolid] = shpool; @@ -1983,13 +1991,13 @@ static int do_tmem_new_pool(domid_t this_cli_id, } } - /* Failed to find a global shard pool slot */ + /* Failed to find a global shared pool slot. */ if ( first_unused_s_poolid == MAX_GLOBAL_SHARED_POOLS ) { tmem_client_warn("tmem: failed... no global shared pool slots available\n"); goto fail; } - /* Add pool to global shard pool */ + /* Add pool to global shared pool. */ else { INIT_LIST_HEAD(&pool->share_list); @@ -2011,7 +2019,7 @@ fail: /************ TMEM CONTROL OPERATIONS ************************************/ -/* freeze/thaw all pools belonging to client cli_id (all domains if -1) */ +/* Freeze/thaw all pools belonging to client cli_id (all domains if -1). */ static int tmemc_freeze_pools(domid_t cli_id, int arg) { struct client *client; @@ -2047,7 +2055,7 @@ static int tmemc_flush_mem(domid_t cli_id, uint32_t kb) tmem_client_str); return -1; } - /* convert kb to pages, rounding up if necessary */ + /* Convert kb to pages, rounding up if necessary. */ npages = (kb + ((1 << (PAGE_SHIFT-10))-1)) >> (PAGE_SHIFT-10); flushed_pages = tmem_flush_npages(npages); flushed_kb = flushed_pages << (PAGE_SHIFT-10); @@ -2164,7 +2172,7 @@ static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off, int n = 0, sum = 0; n = scnprintf(info+n,BSIZE-n,"T="); - n--; /* overwrite trailing comma */ + n--; /* Overwrite trailing comma. */ n += scnprintf(info+n,BSIZE-n,"\n"); if ( sum + n >= len ) return sum; @@ -2450,16 +2458,16 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, ret = -1; goto out; } - /* note: pool->cur_pgp is the pgp last returned by get_next_page */ + /* Note: pool->cur_pgp is the pgp last returned by get_next_page. */ if ( pool->cur_pgp == NULL ) { - /* process the first one */ + /* Process the first one. */ pool->cur_pgp = pgp = list_entry((&pool->persistent_page_list)->next, struct tmem_page_descriptor,us.pool_pers_pages); } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, &pool->persistent_page_list) ) { - /* already processed the last one in the list */ + /* Already processed the last one in the list. */ ret = -1; goto out; } @@ -2665,7 +2673,7 @@ long do_tmem_op(tmem_cli_op_t uops) return -EFAULT; } - /* Acquire wirte lock for all command at first */ + /* Acquire write lock for all commands at first. */ write_lock(&tmem_rwlock); if ( op.cmd == TMEM_CONTROL ) @@ -2715,7 +2723,7 @@ long do_tmem_op(tmem_cli_op_t uops) rc = -ENODEV; goto out; } - /* Commands only need read lock */ + /* Commands that only need read lock. */ write_unlock(&tmem_rwlock); read_lock(&tmem_rwlock); @@ -2767,7 +2775,7 @@ out: return rc; } -/* this should be called when the host is destroying a client */ +/* This should be called when the host is destroying a client (domain). */ void tmem_destroy(void *v) { struct client *client = (struct client *)v; @@ -2790,7 +2798,7 @@ void tmem_destroy(void *v) write_unlock(&tmem_rwlock); } -#define MAX_EVICTS 10 /* should be variable or set via XEN_SYSCTL_TMEM_OP_ ?? */ +#define MAX_EVICTS 10 /* Should be variable or set via XEN_SYSCTL_TMEM_OP_ ?? */ void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) { struct page_info *pfp; @@ -2832,7 +2840,7 @@ unsigned long tmem_freeable_pages(void) return tmem_page_list_pages + _atomic_read(freeable_page_count); } -/* called at hypervisor startup */ +/* Called at hypervisor startup. */ static int __init init_tmem(void) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:25:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:25:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahU-0007qb-Gw; Wed, 09 Sep 2015 08:25:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahS-0007qP-V8 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:52 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 01/77-28221-D0DEFE55; Wed, 09 Sep 2015 08:25:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1441787147!48057859!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21195 invoked from network); 9 Sep 2015 08:25:47 -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; 9 Sep 2015 08:25:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahO-000066-Se for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahO-0001GU-Qg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:46 +0000 Date: Wed, 09 Sep 2015 08:25:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tmem: Spelling and full stop surgery. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 076cd50657516fd265107101b0a8385e487fc304 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Aug 31 11:14:14 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Sep 2 08:48:13 2015 -0400 tmem: Spelling and full stop surgery. I could not help myself. Signed-off-by: Konrad Rzeszutek Wilk --- xen/common/tmem.c | 234 +++++++++++++++++++++++++++------------------------- 1 files changed, 121 insertions(+), 113 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 331e52f..0436e49 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -15,7 +15,7 @@ */ #ifdef __XEN__ -#include /* host-specific (eg Xen) code goes here */ +#include /* host-specific (eg Xen) code goes here. */ #endif #include @@ -27,7 +27,7 @@ #define TMEM_SPEC_VERSION 1 -/* global statistics (none need to be locked) */ +/* Global statistics (none need to be locked). */ static unsigned long total_tmem_ops = 0; static unsigned long errored_tmem_ops = 0; static unsigned long total_flush_pool = 0; @@ -69,18 +69,18 @@ struct client { bool_t compress; bool_t frozen; bool_t shared_auth_required; - /* for save/restore/migration */ + /* For save/restore/migration. */ bool_t live_migrating; bool_t was_frozen; struct list_head persistent_invalidated_list; struct tmem_page_descriptor *cur_pgp; - /* statistics collection */ + /* Statistics collection. */ unsigned long compress_poor, compress_nomem; unsigned long compressed_pages; uint64_t compressed_sum_size; uint64_t total_cycles; unsigned long succ_pers_puts, succ_eph_gets, succ_pers_gets; - /* shared pool authentication */ + /* Shared pool authentication. */ uint64_t shared_auth_uuid[MAX_GLOBAL_SHARED_POOLS][2]; }; @@ -90,7 +90,7 @@ struct share_list { }; #define POOL_PAGESHIFT (PAGE_SHIFT - 12) -#define OBJ_HASH_BUCKETS 256 /* must be power of two */ +#define OBJ_HASH_BUCKETS 256 /* Must be power of two. */ #define OBJ_HASH_BUCKETS_MASK (OBJ_HASH_BUCKETS-1) struct tmem_pool { @@ -98,19 +98,19 @@ struct tmem_pool { bool_t persistent; bool_t is_dying; struct client *client; - uint64_t uuid[2]; /* 0 for private, non-zero for shared */ + uint64_t uuid[2]; /* 0 for private, non-zero for shared. */ uint32_t pool_id; rwlock_t pool_rwlock; - struct rb_root obj_rb_root[OBJ_HASH_BUCKETS]; /* protected by pool_rwlock */ - struct list_head share_list; /* valid if shared */ - int shared_count; /* valid if shared */ - /* for save/restore/migration */ + struct rb_root obj_rb_root[OBJ_HASH_BUCKETS]; /* Protected by pool_rwlock. */ + struct list_head share_list; /* Valid if shared. */ + int shared_count; /* Valid if shared. */ + /* For save/restore/migration. */ struct list_head persistent_page_list; struct tmem_page_descriptor *cur_pgp; - /* statistics collection */ + /* Statistics collection. */ atomic_t pgp_count; int pgp_count_max; - long obj_count; /* atomicity depends on pool_rwlock held for write */ + long obj_count; /* Atomicity depends on pool_rwlock held for write. */ long obj_count_max; unsigned long objnode_count, objnode_count_max; uint64_t sum_life_cycles; @@ -127,10 +127,10 @@ struct tmem_pool { struct tmem_object_root { struct xen_tmem_oid oid; - struct rb_node rb_tree_node; /* protected by pool->pool_rwlock */ - unsigned long objnode_count; /* atomicity depends on obj_spinlock */ - long pgp_count; /* atomicity depends on obj_spinlock */ - struct radix_tree_root tree_root; /* tree of pages within object */ + struct rb_node rb_tree_node; /* Protected by pool->pool_rwlock. */ + unsigned long objnode_count; /* Atomicity depends on obj_spinlock. */ + long pgp_count; /* Atomicity depends on obj_spinlock. */ + struct radix_tree_root tree_root; /* Tree of pages within object. */ struct tmem_pool *pool; domid_t last_client; spinlock_t obj_spinlock; @@ -154,23 +154,23 @@ struct tmem_page_descriptor { }; struct tmem_object_root *obj; } us; - struct xen_tmem_oid inv_oid; /* used for invalid list only */ + struct xen_tmem_oid inv_oid; /* Used for invalid list only. */ }; pagesize_t size; /* 0 == PAGE_SIZE (pfp), -1 == data invalid, - else compressed data (cdata) */ + else compressed data (cdata). */ uint32_t index; - /* must hold pcd_tree_rwlocks[firstbyte] to use pcd pointer/siblings */ - uint16_t firstbyte; /* NON_SHAREABLE->pfp otherwise->pcd */ - bool_t eviction_attempted; /* CHANGE TO lifetimes? (settable) */ + /* Must hold pcd_tree_rwlocks[firstbyte] to use pcd pointer/siblings. */ + uint16_t firstbyte; /* NON_SHAREABLE->pfp otherwise->pcd. */ + bool_t eviction_attempted; /* CHANGE TO lifetimes? (settable). */ struct list_head pcd_siblings; union { - struct page_info *pfp; /* page frame pointer */ - char *cdata; /* compressed data */ - struct tmem_page_content_descriptor *pcd; /* page dedup */ + struct page_info *pfp; /* Page frame pointer. */ + char *cdata; /* Compressed data. */ + struct tmem_page_content_descriptor *pcd; /* Page dedup. */ }; union { uint64_t timestamp; - uint32_t pool_id; /* used for invalid list only */ + uint32_t pool_id; /* Used for invalid list only. */ }; }; @@ -178,21 +178,21 @@ struct tmem_page_descriptor { struct tmem_page_content_descriptor { union { - struct page_info *pfp; /* page frame pointer */ - char *cdata; /* if compression_enabled */ - char *tze; /* if !compression_enabled, trailing zeroes eliminated */ + struct page_info *pfp; /* Page frame pointer. */ + char *cdata; /* If compression_enabled. */ + char *tze; /* If !compression_enabled, trailing zeroes eliminated. */ }; struct list_head pgp_list; struct rb_node pcd_rb_tree_node; uint32_t pgp_ref_count; - pagesize_t size; /* if compression_enabled -> 0 0 *pfp */ + * else PAGE_SIZE -> *pfp. */ }; -struct rb_root pcd_tree_roots[256]; /* choose based on first byte of page */ -rwlock_t pcd_tree_rwlocks[256]; /* poor man's concurrency for now */ +struct rb_root pcd_tree_roots[256]; /* Choose based on first byte of page. */ +rwlock_t pcd_tree_rwlocks[256]; /* Poor man's concurrency for now. */ -static LIST_HEAD(global_ephemeral_page_list); /* all pages in ephemeral pools */ +static LIST_HEAD(global_ephemeral_page_list); /* All pages in ephemeral pools. */ static LIST_HEAD(global_client_list); @@ -209,14 +209,14 @@ PAGE_LIST_HEAD(tmem_page_list); unsigned long tmem_page_list_pages = 0; DEFINE_RWLOCK(tmem_rwlock); -static DEFINE_SPINLOCK(eph_lists_spinlock); /* protects global AND clients */ +static DEFINE_SPINLOCK(eph_lists_spinlock); /* Protects global AND clients. */ static DEFINE_SPINLOCK(pers_lists_spinlock); #define ASSERT_SPINLOCK(_l) ASSERT(spin_is_locked(_l)) #define ASSERT_WRITELOCK(_l) ASSERT(rw_is_write_locked(_l)) -/* global counters (should use long_atomic_t access) */ -static long global_eph_count = 0; /* atomicity depends on eph_lists_spinlock */ +/* Global counters (should use long_atomic_t access). */ +static long global_eph_count = 0; /* Atomicity depends on eph_lists_spinlock. */ static atomic_t global_obj_count = ATOMIC_INIT(0); static atomic_t global_pgp_count = ATOMIC_INIT(0); static atomic_t global_pcd_count = ATOMIC_INIT(0); @@ -341,7 +341,7 @@ static int __init tmem_mempool_init(void) return tmem_mempool != NULL; } -/* persistent pools are per-domain */ +/* Persistent pools are per-domain. */ static void *tmem_persistent_pool_page_get(unsigned long size) { struct page_info *pi; @@ -365,7 +365,7 @@ static void tmem_persistent_pool_page_put(void *page_va) } /* - * Page content descriptor manipulation routines + * Page content descriptor manipulation routines. */ #define NOT_SHAREABLE ((uint16_t)-1UL) @@ -390,8 +390,10 @@ static int pcd_copy_to_client(xen_pfn_t cmfn, struct tmem_page_descriptor *pgp) return ret; } -/* ensure pgp no longer points to pcd, nor vice-versa */ -/* take pcd rwlock unless have_pcd_rwlock is set, always unlock when done */ +/* + * Ensure pgp no longer points to pcd, nor vice-versa. + * Take pcd rwlock unless have_pcd_rwlock is set, always unlock when done. + */ static void pcd_disassociate(struct tmem_page_descriptor *pgp, struct tmem_pool *pool, bool_t have_pcd_rwlock) { struct tmem_page_content_descriptor *pcd = pgp->pcd; @@ -421,30 +423,30 @@ static void pcd_disassociate(struct tmem_page_descriptor *pgp, struct tmem_pool return; } - /* no more references to this pcd, recycle it and the physical page */ + /* No more references to this pcd, recycle it and the physical page. */ ASSERT(list_empty(&pcd->pgp_list)); pcd->pfp = NULL; - /* remove pcd from rbtree */ + /* Remove pcd from rbtree. */ rb_erase(&pcd->pcd_rb_tree_node,&pcd_tree_roots[firstbyte]); - /* reinit the struct for safety for now */ + /* Reinit the struct for safety for now. */ RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); - /* now free up the pcd memory */ + /* Now free up the pcd memory. */ tmem_free(pcd, NULL); atomic_dec_and_assert(global_pcd_count); if ( pgp_size != 0 && pcd_size < PAGE_SIZE ) { - /* compressed data */ + /* Compressed data. */ tmem_free(pcd_cdata, pool); pcd_tot_csize -= pcd_csize; } else if ( pcd_size != PAGE_SIZE ) { - /* trailing zero data */ + /* Trailing zero data. */ pcd_tot_tze_size -= pcd_size; if ( pcd_size ) tmem_free(pcd_tze, pool); } else { - /* real physical page */ + /* Real physical page. */ if ( tmem_tze_enabled() ) pcd_tot_tze_size -= PAGE_SIZE; if ( tmem_compression_enabled() ) @@ -485,48 +487,50 @@ static int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize } write_lock(&pcd_tree_rwlocks[firstbyte]); - /* look for page match */ + /* Look for page match. */ root = &pcd_tree_roots[firstbyte]; new = &(root->rb_node); while ( *new ) { pcd = container_of(*new, struct tmem_page_content_descriptor, pcd_rb_tree_node); parent = *new; - /* compare new entry and rbtree entry, set cmp accordingly */ + /* Compare new entry and rbtree entry, set cmp accordingly. */ if ( cdata != NULL ) { if ( pcd->size < PAGE_SIZE ) - /* both new entry and rbtree entry are compressed */ + /* Both new entry and rbtree entry are compressed. */ cmp = tmem_pcd_cmp(cdata,csize,pcd->cdata,pcd->size); else - /* new entry is compressed, rbtree entry is not */ + /* New entry is compressed, rbtree entry is not. */ cmp = -1; } else if ( pcd->size < PAGE_SIZE ) - /* rbtree entry is compressed, rbtree entry is not */ + /* Rbtree entry is compressed, rbtree entry is not. */ cmp = 1; else if ( tmem_tze_enabled() ) { if ( pcd->size < PAGE_SIZE ) - /* both new entry and rbtree entry are trailing zero */ + /* Both new entry and rbtree entry are trailing zero. */ cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->tze,pcd->size); else - /* new entry is trailing zero, rbtree entry is not */ + /* New entry is trailing zero, rbtree entry is not. */ cmp = tmem_tze_pfp_cmp(pgp->pfp,pfp_size,pcd->pfp,PAGE_SIZE); } else { - /* both new entry and rbtree entry are full physical pages */ + /* Both new entry and rbtree entry are full physical pages. */ ASSERT(pgp->pfp != NULL); ASSERT(pcd->pfp != NULL); cmp = tmem_page_cmp(pgp->pfp,pcd->pfp); } - /* walk tree or match depending on cmp */ + /* Walk tree or match depending on cmp. */ if ( cmp < 0 ) new = &((*new)->rb_left); else if ( cmp > 0 ) new = &((*new)->rb_right); else { - /* match! if not compressed, free the no-longer-needed page */ - /* but if compressed, data is assumed static so don't free! */ + /* + * Match! if not compressed, free the no-longer-needed page + * but if compressed, data is assumed static so don't free! + */ if ( cdata == NULL ) tmem_free_page(pgp->us.obj->pool,pgp->pfp); deduped_puts++; @@ -534,7 +538,7 @@ static int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize } } - /* exited while loop with no match, so alloc a pcd and put it in the tree */ + /* Exited while loop with no match, so alloc a pcd and put it in the tree. */ if ( (pcd = tmem_malloc(sizeof(struct tmem_page_content_descriptor), NULL)) == NULL ) { ret = -ENOMEM; @@ -548,8 +552,8 @@ static int pcd_associate(struct tmem_page_descriptor *pgp, char *cdata, pagesize } } atomic_inc_and_max(global_pcd_count); - RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* is this necessary */ - INIT_LIST_HEAD(&pcd->pgp_list); /* is this necessary */ + RB_CLEAR_NODE(&pcd->pcd_rb_tree_node); /* Is this necessary? */ + INIT_LIST_HEAD(&pcd->pgp_list); /* Is this necessary? */ pcd->pgp_ref_count = 0; if ( cdata != NULL ) { @@ -591,7 +595,7 @@ unlock: /************ PAGE DESCRIPTOR MANIPULATION ROUTINES *******************/ -/* allocate a struct tmem_page_descriptor and associate it with an object */ +/* Allocate a struct tmem_page_descriptor and associate it with an object. */ static struct tmem_page_descriptor *pgp_alloc(struct tmem_object_root *obj) { struct tmem_page_descriptor *pgp; @@ -635,7 +639,7 @@ static void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem_pool *po if ( pgp->pfp == NULL ) return; if ( tmem_dedup_enabled() && pgp->firstbyte != NOT_SHAREABLE ) - pcd_disassociate(pgp,pool,0); /* pgp->size lost */ + pcd_disassociate(pgp,pool,0); /* pgp->size lost. */ else if ( pgp_size ) tmem_free(pgp->cdata, pool); else @@ -683,7 +687,7 @@ static void pgp_free(struct tmem_page_descriptor *pgp) __pgp_free(pgp, pool); } -/* remove pgp from global/pool/client lists and free it */ +/* Remove pgp from global/pool/client lists and free it. */ static void pgp_delist_free(struct tmem_page_descriptor *pgp) { struct client *client; @@ -695,7 +699,7 @@ static void pgp_delist_free(struct tmem_page_descriptor *pgp) client = pgp->us.obj->pool->client; ASSERT(client != NULL); - /* Delist pgp */ + /* Delist pgp. */ if ( !is_persistent(pgp->us.obj->pool) ) { spin_lock(&eph_lists_spinlock); @@ -730,11 +734,11 @@ static void pgp_delist_free(struct tmem_page_descriptor *pgp) life = get_cycles() - pgp->timestamp; pgp->us.obj->pool->sum_life_cycles += life; - /* free pgp */ + /* Free pgp. */ pgp_free(pgp); } -/* called only indirectly by radix_tree_destroy */ +/* Called only indirectly by radix_tree_destroy. */ static void pgp_destroy(void *v) { struct tmem_page_descriptor *pgp = (struct tmem_page_descriptor *)v; @@ -771,7 +775,7 @@ static struct tmem_page_descriptor *pgp_delete_from_obj(struct tmem_object_root /************ RADIX TREE NODE MANIPULATION ROUTINES *******************/ -/* called only indirectly from radix_tree_insert */ +/* Called only indirectly from radix_tree_insert. */ static struct radix_tree_node *rtn_alloc(void *arg) { struct tmem_object_node *objnode; @@ -790,7 +794,7 @@ static struct radix_tree_node *rtn_alloc(void *arg) return &objnode->rtn; } -/* called only indirectly from radix_tree_delete/destroy */ +/* Called only indirectly from radix_tree_delete/destroy. */ static void rtn_free(struct radix_tree_node *rtn, void *arg) { struct tmem_pool *pool; @@ -847,7 +851,7 @@ static unsigned oid_hash(struct xen_tmem_oid *oidp) BITS_PER_LONG) & OBJ_HASH_BUCKETS_MASK); } -/* searches for object==oid in pool, returns locked object if found */ +/* Searches for object==oid in pool, returns locked object if found. */ static struct tmem_object_root * obj_find(struct tmem_pool *pool, struct xen_tmem_oid *oidp) { @@ -862,7 +866,7 @@ restart_find: obj = container_of(node, struct tmem_object_root, rb_tree_node); switch ( oid_compare(&obj->oid, oidp) ) { - case 0: /* equal */ + case 0: /* Equal. */ if ( !spin_trylock(&obj->obj_spinlock) ) { read_unlock(&pool->pool_rwlock); @@ -881,7 +885,7 @@ restart_find: return NULL; } -/* free an object that has no more pgps in it */ +/* Free an object that has no more pgps in it. */ static void obj_free(struct tmem_object_root *obj) { struct tmem_pool *pool; @@ -894,7 +898,7 @@ static void obj_free(struct tmem_object_root *obj) ASSERT(pool != NULL); ASSERT(pool->client != NULL); ASSERT_WRITELOCK(&pool->pool_rwlock); - if ( obj->tree_root.rnode != NULL ) /* may be a "stump" with no leaves */ + if ( obj->tree_root.rnode != NULL ) /* May be a "stump" with no leaves. */ radix_tree_destroy(&obj->tree_root, pgp_destroy); ASSERT((long)obj->objnode_count == 0); ASSERT(obj->tree_root.rnode == NULL); @@ -941,8 +945,8 @@ static int obj_rb_insert(struct rb_root *root, struct tmem_object_root *obj) } /* - * allocate, initialize, and insert an tmem_object_root - * (should be called only if find failed) + * Allocate, initialize, and insert an tmem_object_root + * (should be called only if find failed). */ static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, struct xen_tmem_oid *oidp) @@ -967,7 +971,7 @@ static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, return obj; } -/* free an object after destroying any pgps in it */ +/* Free an object after destroying any pgps in it. */ static void obj_destroy(struct tmem_object_root *obj) { ASSERT_WRITELOCK(&obj->pool->pool_rwlock); @@ -975,7 +979,7 @@ static void obj_destroy(struct tmem_object_root *obj) obj_free(obj); } -/* destroys all objs in a pool, or only if obj->last_client matches cli_id */ +/* Destroys all objs in a pool, or only if obj->last_client matches cli_id. */ static void pool_destroy_objs(struct tmem_pool *pool, domid_t cli_id) { struct rb_node *node; @@ -1047,7 +1051,7 @@ static int shared_pool_join(struct tmem_pool *pool, struct client *new_client) return 0; } -/* reassign "ownership" of the pool to another client that shares this pool */ +/* Reassign "ownership" of the pool to another client that shares this pool. */ static void shared_pool_reassign(struct tmem_pool *pool) { struct share_list *sl; @@ -1080,8 +1084,10 @@ static void shared_pool_reassign(struct tmem_pool *pool) pool->pool_id = poolid; } -/* destroy all objects with last_client same as passed cli_id, - remove pool's cli_id from list of sharers of this pool */ +/* + * Destroy all objects with last_client same as passed cli_id, + * remove pool's cli_id from list of sharers of this pool. + */ static int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) { struct share_list *sl; @@ -1116,7 +1122,7 @@ static int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) return -1; } -/* flush all data (owned by cli_id) from a pool and, optionally, free it */ +/* Flush all data (owned by cli_id) from a pool and, optionally, free it. */ static void pool_flush(struct tmem_pool *pool, domid_t cli_id) { ASSERT(pool != NULL); @@ -1205,7 +1211,7 @@ static void client_free(struct client *client) xfree(client); } -/* flush all data from a client and, optionally, free it */ +/* Flush all data from a client and, optionally, free it. */ static void client_flush(struct client *client) { int i; @@ -1307,12 +1313,12 @@ static int tmem_evict(void) goto found; } } - /* global_ephemeral_page_list is empty, so we bail out. */ + /* Global_ephemeral_page_list is empty, so we bail out. */ spin_unlock(&eph_lists_spinlock); goto out; found: - /* Delist */ + /* Delist. */ list_del_init(&pgp->us.client_eph_pages); client->eph_count--; list_del_init(&pgp->global_eph_pages); @@ -1336,7 +1342,7 @@ found: pcd_disassociate(pgp,pool,1); } - /* pgp already delist, so call pgp_free directly */ + /* pgp already delist, so call pgp_free directly. */ pgp_free(pgp); if ( obj->pgp_count == 0 ) { @@ -1464,8 +1470,8 @@ static int do_tmem_dup_put(struct tmem_page_descriptor *pgp, xen_pfn_t cmfn, ASSERT(pool != NULL); client = pool->client; if ( client->live_migrating ) - goto failed_dup; /* no dups allowed when migrating */ - /* can we successfully manipulate pgp to change out the data? */ + goto failed_dup; /* No dups allowed when migrating. */ + /* Can we successfully manipulate pgp to change out the data? */ if ( client->compress && pgp->size != 0 ) { ret = do_tmem_put_compress(pgp, cmfn, clibuf); @@ -1495,7 +1501,7 @@ copy_uncompressed: } done: - /* successfully replaced data, clean up and return success */ + /* Successfully replaced data, clean up and return success. */ if ( is_shared(pool) ) obj->last_client = client->cli_id; spin_unlock(&obj->obj_spinlock); @@ -1510,8 +1516,10 @@ bad_copy: goto cleanup; failed_dup: - /* couldn't change out the data, flush the old data and return - * -ENOSPC instead of -ENOMEM to differentiate failed _dup_ put */ + /* + * Couldn't change out the data, flush the old data and return + * -ENOSPC instead of -ENOMEM to differentiate failed _dup_ put. + */ ret = -ENOSPC; cleanup: pgpfound = pgp_delete_from_obj(obj, pgp->index); @@ -1545,7 +1553,7 @@ static int do_tmem_put(struct tmem_pool *pool, pool->puts++; refind: - /* does page already exist (dup)? if so, handle specially */ + /* Does page already exist (dup)? if so, handle specially. */ if ( (obj = obj_find(pool, oidp)) != NULL ) { if ((pgp = pgp_lookup_in_obj(obj, index)) != NULL) @@ -1554,14 +1562,14 @@ refind: } else { - /* no puts allowed into a frozen pool (except dup puts) */ + /* No puts allowed into a frozen pool (except dup puts). */ if ( client->frozen ) goto unlock_obj; } } else { - /* no puts allowed into a frozen pool (except dup puts) */ + /* No puts allowed into a frozen pool (except dup puts). */ if ( client->frozen ) return ret; if ( (obj = obj_alloc(pool, oidp)) == NULL ) @@ -1584,14 +1592,14 @@ refind: write_unlock(&pool->pool_rwlock); } - /* When arrive here, we have a spinlocked obj for use */ + /* When arrive here, we have a spinlocked obj for use. */ ASSERT_SPINLOCK(&obj->obj_spinlock); if ( (pgp = pgp_alloc(obj)) == NULL ) goto unlock_obj; ret = pgp_add_to_obj(obj, index, pgp); if ( ret == -ENOMEM ) - /* warning, may result in partially built radix tree ("stump") */ + /* Warning: may result in partially built radix tree ("stump"). */ goto free_pgp; pgp->index = index; @@ -1651,7 +1659,7 @@ insert_page: spin_unlock(&eph_lists_spinlock); } else - { /* is_persistent */ + { /* is_persistent. */ spin_lock(&pers_lists_spinlock); list_add_tail(&pgp->us.pool_pers_pages, &pool->persistent_page_list); @@ -1661,7 +1669,7 @@ insert_page: if ( is_shared(pool) ) obj->last_client = client->cli_id; - /* free the obj spinlock */ + /* Free the obj spinlock. */ spin_unlock(&obj->obj_spinlock); pool->good_puts++; @@ -1954,7 +1962,7 @@ static int do_tmem_new_pool(domid_t this_cli_id, /* * Authorize okay, match a global shared pool or use the newly allocated - * one + * one. */ first_unused_s_poolid = MAX_GLOBAL_SHARED_POOLS; for ( i = 0; i < MAX_GLOBAL_SHARED_POOLS; i++ ) @@ -1963,7 +1971,7 @@ static int do_tmem_new_pool(domid_t this_cli_id, { if ( shpool->uuid[0] == uuid_lo && shpool->uuid[1] == uuid_hi ) { - /* Succ to match a global shared pool */ + /* Succ to match a global shared pool. */ tmem_client_info("(matches shared pool uuid=%"PRIx64".%"PRIx64") pool_id=%d\n", uuid_hi, uuid_lo, d_poolid); client->pools[d_poolid] = shpool; @@ -1983,13 +1991,13 @@ static int do_tmem_new_pool(domid_t this_cli_id, } } - /* Failed to find a global shard pool slot */ + /* Failed to find a global shared pool slot. */ if ( first_unused_s_poolid == MAX_GLOBAL_SHARED_POOLS ) { tmem_client_warn("tmem: failed... no global shared pool slots available\n"); goto fail; } - /* Add pool to global shard pool */ + /* Add pool to global shared pool. */ else { INIT_LIST_HEAD(&pool->share_list); @@ -2011,7 +2019,7 @@ fail: /************ TMEM CONTROL OPERATIONS ************************************/ -/* freeze/thaw all pools belonging to client cli_id (all domains if -1) */ +/* Freeze/thaw all pools belonging to client cli_id (all domains if -1). */ static int tmemc_freeze_pools(domid_t cli_id, int arg) { struct client *client; @@ -2047,7 +2055,7 @@ static int tmemc_flush_mem(domid_t cli_id, uint32_t kb) tmem_client_str); return -1; } - /* convert kb to pages, rounding up if necessary */ + /* Convert kb to pages, rounding up if necessary. */ npages = (kb + ((1 << (PAGE_SHIFT-10))-1)) >> (PAGE_SHIFT-10); flushed_pages = tmem_flush_npages(npages); flushed_kb = flushed_pages << (PAGE_SHIFT-10); @@ -2164,7 +2172,7 @@ static int tmemc_list_global_perf(tmem_cli_va_param_t buf, int off, int n = 0, sum = 0; n = scnprintf(info+n,BSIZE-n,"T="); - n--; /* overwrite trailing comma */ + n--; /* Overwrite trailing comma. */ n += scnprintf(info+n,BSIZE-n,"\n"); if ( sum + n >= len ) return sum; @@ -2450,16 +2458,16 @@ static int tmemc_save_get_next_page(int cli_id, uint32_t pool_id, ret = -1; goto out; } - /* note: pool->cur_pgp is the pgp last returned by get_next_page */ + /* Note: pool->cur_pgp is the pgp last returned by get_next_page. */ if ( pool->cur_pgp == NULL ) { - /* process the first one */ + /* Process the first one. */ pool->cur_pgp = pgp = list_entry((&pool->persistent_page_list)->next, struct tmem_page_descriptor,us.pool_pers_pages); } else if ( list_is_last(&pool->cur_pgp->us.pool_pers_pages, &pool->persistent_page_list) ) { - /* already processed the last one in the list */ + /* Already processed the last one in the list. */ ret = -1; goto out; } @@ -2665,7 +2673,7 @@ long do_tmem_op(tmem_cli_op_t uops) return -EFAULT; } - /* Acquire wirte lock for all command at first */ + /* Acquire write lock for all commands at first. */ write_lock(&tmem_rwlock); if ( op.cmd == TMEM_CONTROL ) @@ -2715,7 +2723,7 @@ long do_tmem_op(tmem_cli_op_t uops) rc = -ENODEV; goto out; } - /* Commands only need read lock */ + /* Commands that only need read lock. */ write_unlock(&tmem_rwlock); read_lock(&tmem_rwlock); @@ -2767,7 +2775,7 @@ out: return rc; } -/* this should be called when the host is destroying a client */ +/* This should be called when the host is destroying a client (domain). */ void tmem_destroy(void *v) { struct client *client = (struct client *)v; @@ -2790,7 +2798,7 @@ void tmem_destroy(void *v) write_unlock(&tmem_rwlock); } -#define MAX_EVICTS 10 /* should be variable or set via XEN_SYSCTL_TMEM_OP_ ?? */ +#define MAX_EVICTS 10 /* Should be variable or set via XEN_SYSCTL_TMEM_OP_ ?? */ void *tmem_relinquish_pages(unsigned int order, unsigned int memflags) { struct page_info *pfp; @@ -2832,7 +2840,7 @@ unsigned long tmem_freeable_pages(void) return tmem_page_list_pages + _atomic_read(freeable_page_count); } -/* called at hypervisor startup */ +/* Called at hypervisor startup. */ static int __init init_tmem(void) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZahc-0007sM-Ld; Wed, 09 Sep 2015 08:26:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahb-0007s7-Cg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:59 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 1B/C6-19220-61DEFE55; Wed, 09 Sep 2015 08:25:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1441787157!33816920!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 438 invoked from network); 9 Sep 2015 08:25:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:25:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahZ-00006E-1v for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahZ-0001HP-18 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:57 +0000 Date: Wed, 09 Sep 2015 08:25:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8747dba3b7218b6e21999fbfdff9d4f807650269 Merge: 16181cbb107ea70a72f41982b371c444926f48f2 076cd50657516fd265107101b0a8385e487fc304 Author: Ian Campbell AuthorDate: Wed Sep 2 14:27:01 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 14:27:01 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/libxc/include/xenctrl.h | 8 +- tools/libxc/xc_tmem.c | 123 ++++----- tools/libxl/libxl.c | 22 +- tools/python/xen/lowlevel/xc/xc.c | 27 +- tools/xenstat/libxenstat/src/xenstat.c | 6 +- xen/common/compat/tmem_xen.c | 4 +- xen/common/sysctl.c | 7 +- xen/common/tmem.c | 477 +++++++++++++++++--------------- xen/include/public/sysctl.h | 56 ++++ xen/include/public/tmem.h | 58 +--- xen/include/xen/tmem.h | 3 + xen/include/xen/tmem_xen.h | 4 - xen/include/xlat.lst | 1 + xen/include/xsm/dummy.h | 6 - xen/include/xsm/xsm.h | 6 - xen/xsm/dummy.c | 1 - xen/xsm/flask/hooks.c | 9 +- xen/xsm/flask/policy/access_vectors | 2 +- 18 files changed, 425 insertions(+), 395 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZahc-0007sM-Ld; Wed, 09 Sep 2015 08:26:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahb-0007s7-Cg for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:59 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 1B/C6-19220-61DEFE55; Wed, 09 Sep 2015 08:25:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1441787157!33816920!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 438 invoked from network); 9 Sep 2015 08:25:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:25:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahZ-00006E-1v for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahZ-0001HP-18 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:25:57 +0000 Date: Wed, 09 Sep 2015 08:25:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8747dba3b7218b6e21999fbfdff9d4f807650269 Merge: 16181cbb107ea70a72f41982b371c444926f48f2 076cd50657516fd265107101b0a8385e487fc304 Author: Ian Campbell AuthorDate: Wed Sep 2 14:27:01 2015 +0100 Commit: Ian Campbell CommitDate: Wed Sep 2 14:27:01 2015 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging tools/libxc/include/xenctrl.h | 8 +- tools/libxc/xc_tmem.c | 123 ++++----- tools/libxl/libxl.c | 22 +- tools/python/xen/lowlevel/xc/xc.c | 27 +- tools/xenstat/libxenstat/src/xenstat.c | 6 +- xen/common/compat/tmem_xen.c | 4 +- xen/common/sysctl.c | 7 +- xen/common/tmem.c | 477 +++++++++++++++++--------------- xen/include/public/sysctl.h | 56 ++++ xen/include/public/tmem.h | 58 +--- xen/include/xen/tmem.h | 3 + xen/include/xen/tmem_xen.h | 4 - xen/include/xlat.lst | 1 + xen/include/xsm/dummy.h | 6 - xen/include/xsm/xsm.h | 6 - xen/xsm/dummy.c | 1 - xen/xsm/flask/hooks.c | 9 +- xen/xsm/flask/policy/access_vectors | 2 +- 18 files changed, 425 insertions(+), 395 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaho-0007un-QI; Wed, 09 Sep 2015 08:26:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahn-0007ub-La for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:11 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D3/6F-24856-32DEFE55; Wed, 09 Sep 2015 08:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441787167!33797447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32289 invoked from network); 9 Sep 2015 08:26:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahj-00006p-6e for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahj-0001Hx-5b for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:07 +0000 Date: Wed, 09 Sep 2015 08:26:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm64: do not (incorrectly) limit size of xenheap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a7167d9b20cdc48e6ea320fbbb920b3267c9757 Author: Julien Grall AuthorDate: Fri Sep 4 13:57:00 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 14:58:07 2015 +0100 xen/arm64: do not (incorrectly) limit size of xenheap The commit 88e3ed61642bb393458acc7a9bd2f96edc337190 "x86/NUMA: make init_node_heap() respect Xen heap limit" breaks boot on the arm64 board X-Gene. The xenheap bits variable is used to know the last RAM MFN always mapped in Xen virtual memory. If the value is 0, it means that all the memory is always mapped in Xen virtual memory. On X-gene the RAM bank resides above 128GB and last xenheap MFN is 0x4400000. With the new way to calculate the number of bits, xenheap_bits will be equal to 38 bits. This will result to hide all the RAM and the impossibility to allocate xenheap memory. Given that aarch64 have always all the memory mapped in Xen virtual memory, it's not necessary to call xenheap_max_mfn which set the number of bits. Suggested-by: Jan Beulich Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6626eba..48f734f 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -665,7 +665,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; xenheap_mfn_start = ram_start >> PAGE_SHIFT; xenheap_mfn_end = ram_end >> PAGE_SHIFT; - xenheap_max_mfn(xenheap_mfn_end); /* * Need enough mapped pages for copying the DTB. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaho-0007un-QI; Wed, 09 Sep 2015 08:26:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahn-0007ub-La for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:11 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id D3/6F-24856-32DEFE55; Wed, 09 Sep 2015 08:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1441787167!33797447!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32289 invoked from network); 9 Sep 2015 08:26:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahj-00006p-6e for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZahj-0001Hx-5b for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:07 +0000 Date: Wed, 09 Sep 2015 08:26:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm64: do not (incorrectly) limit size of xenheap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0a7167d9b20cdc48e6ea320fbbb920b3267c9757 Author: Julien Grall AuthorDate: Fri Sep 4 13:57:00 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 14:58:07 2015 +0100 xen/arm64: do not (incorrectly) limit size of xenheap The commit 88e3ed61642bb393458acc7a9bd2f96edc337190 "x86/NUMA: make init_node_heap() respect Xen heap limit" breaks boot on the arm64 board X-Gene. The xenheap bits variable is used to know the last RAM MFN always mapped in Xen virtual memory. If the value is 0, it means that all the memory is always mapped in Xen virtual memory. On X-gene the RAM bank resides above 128GB and last xenheap MFN is 0x4400000. With the new way to calculate the number of bits, xenheap_bits will be equal to 38 bits. This will result to hide all the RAM and the impossibility to allocate xenheap memory. Given that aarch64 have always all the memory mapped in Xen virtual memory, it's not necessary to call xenheap_max_mfn which set the number of bits. Suggested-by: Jan Beulich Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/setup.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 6626eba..48f734f 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -665,7 +665,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; xenheap_mfn_start = ram_start >> PAGE_SHIFT; xenheap_mfn_end = ram_end >> PAGE_SHIFT; - xenheap_max_mfn(xenheap_mfn_end); /* * Need enough mapped pages for copying the DTB. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZahw-0007wL-Sn; Wed, 09 Sep 2015 08:26:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahv-0007w5-NM for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:19 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id EB/72-31069-A2DEFE55; Wed, 09 Sep 2015 08:26:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1441787177!11493648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28996 invoked from network); 9 Sep 2015 08:26:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaht-00006x-AP for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaht-0001IK-9c for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:17 +0000 Date: Wed, 09 Sep 2015 08:26:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-access: use PRI_xen_pfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9be0990fb8b34c30ca62d5e6a003ed73386f2e8 Author: Wei Liu AuthorDate: Thu Sep 3 19:27:47 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 14:59:10 2015 +0100 tools/xen-access: use PRI_xen_pfn Otherwise when building with 32bit compiler, we get: xen-access.c: In function 'xenaccess_init': xen-access.c:263:5: error: format '%llx' expects argument of type 'long long unsigned int', but argument 3 has type 'xen_pfn_t' [-Werror=format] cc1: all warnings being treated as errors Signed-off-by: Wei Liu Acked-by: Tamas K Lengyel Acked-by: Razvan Cojocaru --- tools/tests/xen-access/xen-access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index cdb8f4e..a52ca6e 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -260,7 +260,7 @@ xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) goto err; } - DPRINTF("max_gpfn = %"PRIx64"\n", xenaccess->max_gpfn); + DPRINTF("max_gpfn = %"PRI_xen_pfn"\n", xenaccess->max_gpfn); return xenaccess; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZahw-0007wL-Sn; Wed, 09 Sep 2015 08:26:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZahv-0007w5-NM for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:19 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id EB/72-31069-A2DEFE55; Wed, 09 Sep 2015 08:26:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1441787177!11493648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28996 invoked from network); 9 Sep 2015 08:26:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaht-00006x-AP for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaht-0001IK-9c for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:17 +0000 Date: Wed, 09 Sep 2015 08:26:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-access: use PRI_xen_pfn X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d9be0990fb8b34c30ca62d5e6a003ed73386f2e8 Author: Wei Liu AuthorDate: Thu Sep 3 19:27:47 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 14:59:10 2015 +0100 tools/xen-access: use PRI_xen_pfn Otherwise when building with 32bit compiler, we get: xen-access.c: In function 'xenaccess_init': xen-access.c:263:5: error: format '%llx' expects argument of type 'long long unsigned int', but argument 3 has type 'xen_pfn_t' [-Werror=format] cc1: all warnings being treated as errors Signed-off-by: Wei Liu Acked-by: Tamas K Lengyel Acked-by: Razvan Cojocaru --- tools/tests/xen-access/xen-access.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index cdb8f4e..a52ca6e 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -260,7 +260,7 @@ xenaccess_t *xenaccess_init(xc_interface **xch_r, domid_t domain_id) goto err; } - DPRINTF("max_gpfn = %"PRIx64"\n", xenaccess->max_gpfn); + DPRINTF("max_gpfn = %"PRI_xen_pfn"\n", xenaccess->max_gpfn); return xenaccess; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZai7-0007z1-VG; Wed, 09 Sep 2015 08:26:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZai6-0007xt-7a for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:30 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 40/A1-18744-53DEFE55; Wed, 09 Sep 2015 08:26:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1441787187!21505123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22580 invoked from network); 9 Sep 2015 08:26:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZai3-000075-FZ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZai3-0001Ij-El for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:27 +0000 Date: Wed, 09 Sep 2015 08:26:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dt: Handle correctly node without interrupt-map in dt_for_each_irq_map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f42f2cbe54079a7480fa584680d7f7b849b97136 Author: Vijaya Kumar K AuthorDate: Mon Aug 31 16:36:18 2015 +0530 Commit: Ian Campbell CommitDate: Fri Sep 4 15:00:39 2015 +0100 xen/dt: Handle correctly node without interrupt-map in dt_for_each_irq_map dt_for_each_irq_map() returns error if no irq mapping is found. With this patch, ignore error and return success Signed-off-by: Vijaya Kumar K Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 323c3be..18cdb6f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1081,11 +1081,11 @@ int dt_for_each_irq_map(const struct dt_device_node *dev, /* Now look for an interrupt-map */ imap = dt_get_property(dev, "interrupt-map", &imaplen); - /* No interrupt map, check for an interrupt parent */ + /* No interrupt-map found. Ignore */ if ( imap == NULL ) { dt_dprintk(" -> no map, ignoring\n"); - goto fail; + return 0; } imaplen /= sizeof(u32); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZai7-0007z1-VG; Wed, 09 Sep 2015 08:26:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZai6-0007xt-7a for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:30 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 40/A1-18744-53DEFE55; Wed, 09 Sep 2015 08:26:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1441787187!21505123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22580 invoked from network); 9 Sep 2015 08:26:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZai3-000075-FZ for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZai3-0001Ij-El for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:27 +0000 Date: Wed, 09 Sep 2015 08:26:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/dt: Handle correctly node without interrupt-map in dt_for_each_irq_map X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f42f2cbe54079a7480fa584680d7f7b849b97136 Author: Vijaya Kumar K AuthorDate: Mon Aug 31 16:36:18 2015 +0530 Commit: Ian Campbell CommitDate: Fri Sep 4 15:00:39 2015 +0100 xen/dt: Handle correctly node without interrupt-map in dt_for_each_irq_map dt_for_each_irq_map() returns error if no irq mapping is found. With this patch, ignore error and return success Signed-off-by: Vijaya Kumar K Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/common/device_tree.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c index 323c3be..18cdb6f 100644 --- a/xen/common/device_tree.c +++ b/xen/common/device_tree.c @@ -1081,11 +1081,11 @@ int dt_for_each_irq_map(const struct dt_device_node *dev, /* Now look for an interrupt-map */ imap = dt_get_property(dev, "interrupt-map", &imaplen); - /* No interrupt map, check for an interrupt parent */ + /* No interrupt-map found. Ignore */ if ( imap == NULL ) { dt_dprintk(" -> no map, ignoring\n"); - goto fail; + return 0; } imaplen /= sizeof(u32); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZaiH-00081O-2Y; Wed, 09 Sep 2015 08:26:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiF-000813-Vy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:40 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id F3/88-01421-F3DEFE55; Wed, 09 Sep 2015 08:26:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1441787197!42666243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23380 invoked from network); 9 Sep 2015 08:26:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiD-00007D-KT for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaiD-0001Ja-Iw for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:37 +0000 Date: Wed, 09 Sep 2015 08:26:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: update top-level make help X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 06925643ce4e13a2e8d1e2e71fd12d11f81b8b3c Author: Doug Goldstein AuthorDate: Tue Sep 1 15:10:08 2015 -0500 Commit: Ian Campbell CommitDate: Fri Sep 4 15:02:51 2015 +0100 build: update top-level make help Update the top-level make help to include all the possible targets and not reference targets that are deprecated while hopefully being more clear as to what each target does. Signed-off-by: Doug Goldstein Acked-by: Ian Campbell --- Makefile | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ba0df70..75177f0 100644 --- a/Makefile +++ b/Makefile @@ -228,16 +228,23 @@ help: @echo ' install-stubdom - build and install the stubdomain images' @echo ' install-docs - build and install user documentation' @echo '' - @echo 'Building targets:' + @echo 'Local dist targets:' @echo ' dist - build and install everything into local dist directory' @echo ' world - clean everything then make dist' - @echo ' xen - build and install Xen hypervisor' - @echo ' tools - build and install tools' - @echo ' stubdom - build and install the stubdomain images' - @echo ' docs - build and install user documentation' + @echo ' dist-xen - build Xen hypervisor and install into local dist' + @echo ' dist-tools - build the tools and install into local dist' + @echo ' dist-stubdom - build the stubdomain images and install into local dist' + @echo ' dist-docs - build user documentation and install into local dist' + @echo '' + @echo 'Building targets:' + @echo ' build - build everything' + @echo ' build-xen - build Xen hypervisor' + @echo ' build-tools - build the tools' + @echo ' build-stubdom - build the stubdomain images' + @echo ' build-docs - build user documentation' @echo '' @echo 'Cleaning targets:' - @echo ' clean - clean the Xen, tools and docs (but not guest kernel trees)' + @echo ' clean - clean the Xen, tools and docs' @echo ' distclean - clean plus delete kernel build trees and' @echo ' local downloaded files' @echo ' subtree-force-update - Call *-force-update on all git subtrees (qemu, seabios, ovmf)' -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZaiH-00081O-2Y; Wed, 09 Sep 2015 08:26:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiF-000813-Vy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:40 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id F3/88-01421-F3DEFE55; Wed, 09 Sep 2015 08:26:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1441787197!42666243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23380 invoked from network); 9 Sep 2015 08:26:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiD-00007D-KT for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaiD-0001Ja-Iw for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:37 +0000 Date: Wed, 09 Sep 2015 08:26:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: update top-level make help X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 06925643ce4e13a2e8d1e2e71fd12d11f81b8b3c Author: Doug Goldstein AuthorDate: Tue Sep 1 15:10:08 2015 -0500 Commit: Ian Campbell CommitDate: Fri Sep 4 15:02:51 2015 +0100 build: update top-level make help Update the top-level make help to include all the possible targets and not reference targets that are deprecated while hopefully being more clear as to what each target does. Signed-off-by: Doug Goldstein Acked-by: Ian Campbell --- Makefile | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ba0df70..75177f0 100644 --- a/Makefile +++ b/Makefile @@ -228,16 +228,23 @@ help: @echo ' install-stubdom - build and install the stubdomain images' @echo ' install-docs - build and install user documentation' @echo '' - @echo 'Building targets:' + @echo 'Local dist targets:' @echo ' dist - build and install everything into local dist directory' @echo ' world - clean everything then make dist' - @echo ' xen - build and install Xen hypervisor' - @echo ' tools - build and install tools' - @echo ' stubdom - build and install the stubdomain images' - @echo ' docs - build and install user documentation' + @echo ' dist-xen - build Xen hypervisor and install into local dist' + @echo ' dist-tools - build the tools and install into local dist' + @echo ' dist-stubdom - build the stubdomain images and install into local dist' + @echo ' dist-docs - build user documentation and install into local dist' + @echo '' + @echo 'Building targets:' + @echo ' build - build everything' + @echo ' build-xen - build Xen hypervisor' + @echo ' build-tools - build the tools' + @echo ' build-stubdom - build the stubdomain images' + @echo ' build-docs - build user documentation' @echo '' @echo 'Cleaning targets:' - @echo ' clean - clean the Xen, tools and docs (but not guest kernel trees)' + @echo ' clean - clean the Xen, tools and docs' @echo ' distclean - clean plus delete kernel build trees and' @echo ' local downloaded files' @echo ' subtree-force-update - Call *-force-update on all git subtrees (qemu, seabios, ovmf)' -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZaiR-00083P-2p; Wed, 09 Sep 2015 08:26:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiQ-00083D-9y for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:50 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CA/14-31069-94DEFE55; Wed, 09 Sep 2015 08:26:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1441787208!42740121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13831 invoked from network); 9 Sep 2015 08:26:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiN-00007N-Sx for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaiN-0001KY-O5 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:47 +0000 Date: Wed, 09 Sep 2015 08:26:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: tools/ocaml: update David Scott's email address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09e2a619a4c028a4e452fb557a215c70feb20bc5 Author: David Scott AuthorDate: Wed Sep 2 11:04:41 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 15:03:38 2015 +0100 MAINTAINERS: tools/ocaml: update David Scott's email address Replace my sometimes unreliable address with my reliable permanent address. Reported-by: Doug Goldstein Signed-off-by: David Scott Acked-by: Ian Campbell --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 73a96c9..a7fad84 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -237,7 +237,7 @@ F: config/MiniOS.mk F: extras/mini-os/ OCAML TOOLS -M: David Scott +M: David Scott S: Supported F: tools/ocaml/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:26:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:26: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 1ZZaiR-00083P-2p; Wed, 09 Sep 2015 08:26:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiQ-00083D-9y for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:50 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CA/14-31069-94DEFE55; Wed, 09 Sep 2015 08:26:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1441787208!42740121!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13831 invoked from network); 9 Sep 2015 08:26:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiN-00007N-Sx for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaiN-0001KY-O5 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:47 +0000 Date: Wed, 09 Sep 2015 08:26:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: tools/ocaml: update David Scott's email address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09e2a619a4c028a4e452fb557a215c70feb20bc5 Author: David Scott AuthorDate: Wed Sep 2 11:04:41 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 15:03:38 2015 +0100 MAINTAINERS: tools/ocaml: update David Scott's email address Replace my sometimes unreliable address with my reliable permanent address. Reported-by: Doug Goldstein Signed-off-by: David Scott Acked-by: Ian Campbell --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 73a96c9..a7fad84 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -237,7 +237,7 @@ F: config/MiniOS.mk F: extras/mini-os/ OCAML TOOLS -M: David Scott +M: David Scott S: Supported F: tools/ocaml/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27: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 1ZZaib-00084x-5J; Wed, 09 Sep 2015 08:27:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaia-00084n-Bv for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:00 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 39/57-10422-35DEFE55; Wed, 09 Sep 2015 08:26:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1441787218!33780340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17118 invoked from network); 9 Sep 2015 08:26:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiY-00007Y-1v for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaiY-0001MR-0f for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:58 +0000 Date: Wed, 09 Sep 2015 08:26:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public/io/netif.h: move and amend multicast control documentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2700877adacb93c265c4fa1c637aba66db74817 Author: Paul Durrant AuthorDate: Wed Sep 2 12:17:05 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 15:05:26 2015 +0100 public/io/netif.h: move and amend multicast control documentation netif.h contains a specification of the XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL} extra info messages require to manipulate a multicast filter list maintained by a backend and specifies the xenstore negotiation protocol in a comment just above the structure defintion, which is easy to miss. This patch moves the documentation of the xenstore negotiation to be co-located with the documentation for other features and also amends the wording to be clearer. Signed-off-by: Paul Durrant Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Acked-by: Wei Liu [ ijc -- added a blank line to the comment ] --- xen/include/public/io/netif.h | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index 353eab7..5c31ae3 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -136,6 +136,21 @@ */ /* + * "feature-multicast-control" advertises the capability to filter ethernet + * multicast packets in the backend. To enable use of this capability the + * frontend must set "request-multicast-control" before moving into the + * connected state. + * + * If "request-multicast-control" is set then the backend transmit side should + * no longer flood multicast packets to the frontend, it should instead drop any + * multicast packet that does not match in a filter list. The list is + * amended by the frontend by sending dummy transmit requests containing + * XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL} extra-info fragments as specified below. + * Once enabled by the frontend, the feature cannot be disabled except by + * closing and re-connecting to the backend. + */ + +/* * This is the 'wire' format for packets: * Request 1: netif_tx_request_t -- NETTXF_* (any flags) * [Request 2: netif_extra_info_t] (only if request 1 has NETTXF_extra_info) @@ -341,14 +356,6 @@ struct netif_extra_info { /* * XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL}: - * Backend advertises availability via 'feature-multicast-control' - * xenbus node containing value '1'. - * Frontend requests this feature by advertising - * 'request-multicast-control' xenbus node containing value '1'. - * If multicast control is requested then multicast flooding is - * disabled and the frontend must explicitly register its interest - * in multicast groups using dummy transmit requests containing - * MCAST_{ADD,DEL} extra-info fragments. */ struct { uint8_t addr[6]; /* Address to add/remove. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27: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 1ZZaib-00084x-5J; Wed, 09 Sep 2015 08:27:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaia-00084n-Bv for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:00 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 39/57-10422-35DEFE55; Wed, 09 Sep 2015 08:26:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1441787218!33780340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17118 invoked from network); 9 Sep 2015 08:26:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:26:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiY-00007Y-1v for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaiY-0001MR-0f for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:26:58 +0000 Date: Wed, 09 Sep 2015 08:26:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public/io/netif.h: move and amend multicast control documentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b2700877adacb93c265c4fa1c637aba66db74817 Author: Paul Durrant AuthorDate: Wed Sep 2 12:17:05 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 4 15:05:26 2015 +0100 public/io/netif.h: move and amend multicast control documentation netif.h contains a specification of the XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL} extra info messages require to manipulate a multicast filter list maintained by a backend and specifies the xenstore negotiation protocol in a comment just above the structure defintion, which is easy to miss. This patch moves the documentation of the xenstore negotiation to be co-located with the documentation for other features and also amends the wording to be clearer. Signed-off-by: Paul Durrant Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Acked-by: Wei Liu [ ijc -- added a blank line to the comment ] --- xen/include/public/io/netif.h | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index 353eab7..5c31ae3 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -136,6 +136,21 @@ */ /* + * "feature-multicast-control" advertises the capability to filter ethernet + * multicast packets in the backend. To enable use of this capability the + * frontend must set "request-multicast-control" before moving into the + * connected state. + * + * If "request-multicast-control" is set then the backend transmit side should + * no longer flood multicast packets to the frontend, it should instead drop any + * multicast packet that does not match in a filter list. The list is + * amended by the frontend by sending dummy transmit requests containing + * XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL} extra-info fragments as specified below. + * Once enabled by the frontend, the feature cannot be disabled except by + * closing and re-connecting to the backend. + */ + +/* * This is the 'wire' format for packets: * Request 1: netif_tx_request_t -- NETTXF_* (any flags) * [Request 2: netif_extra_info_t] (only if request 1 has NETTXF_extra_info) @@ -341,14 +356,6 @@ struct netif_extra_info { /* * XEN_NETIF_EXTRA_TYPE_MCAST_{ADD,DEL}: - * Backend advertises availability via 'feature-multicast-control' - * xenbus node containing value '1'. - * Frontend requests this feature by advertising - * 'request-multicast-control' xenbus node containing value '1'. - * If multicast control is requested then multicast flooding is - * disabled and the frontend must explicitly register its interest - * in multicast groups using dummy transmit requests containing - * MCAST_{ADD,DEL} extra-info fragments. */ struct { uint8_t addr[6]; /* Address to add/remove. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZain-00086h-7q; Wed, 09 Sep 2015 08:27:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZail-00086P-Hu for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id A9/E6-00475-E5DEFE55; Wed, 09 Sep 2015 08:27:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1441787228!48079039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2708 invoked from network); 9 Sep 2015 08:27:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaii-000089-6w for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaii-0001Nd-5A for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:08 +0000 Date: Wed, 09 Sep 2015 08:27:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: clearer migration v2 debug message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4776193845165884483875f7694a89e258f7340e Author: Wei Liu AuthorDate: Sun Sep 6 21:05:35 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:53:43 2015 +0100 libxc: clearer migration v2 debug message Previous the message was like: SAVE: xc: detail: 32 bits, 3 levels xc: detail: max_pfn 0xfffff, p2m_frames 1024 xc: detail: max_mfn 0x130000 RESTORE: xc: detail: max_mfn 0x130000 xc: detail: 32 bits, 3 levels xc: detail: Expanded p2m from 0 to 0xfffff It's not immediately clear that the last line in restore messages was referring to max_pfn. Change the debug message a bit to make that clearer. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore_x86_pv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index ef26c64..c65a2f1 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -66,7 +66,7 @@ static int expand_p2m(struct xc_sr_context *ctx, unsigned long max_pfn) for ( i = (old_end_frame ? old_end_frame + 1 : 0); i <= end_frame; ++i ) ctx->x86_pv.p2m_pfns[i] = INVALID_MFN; - DPRINTF("Expanded p2m from %#lx to %#lx", old_max, max_pfn); + DPRINTF("Changed max_pfn from %#lx to %#lx", old_max, max_pfn); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZain-00086h-7q; Wed, 09 Sep 2015 08:27:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZail-00086P-Hu for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id A9/E6-00475-E5DEFE55; Wed, 09 Sep 2015 08:27:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1441787228!48079039!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2708 invoked from network); 9 Sep 2015 08:27:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaii-000089-6w for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaii-0001Nd-5A for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:08 +0000 Date: Wed, 09 Sep 2015 08:27:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: clearer migration v2 debug message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4776193845165884483875f7694a89e258f7340e Author: Wei Liu AuthorDate: Sun Sep 6 21:05:35 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:53:43 2015 +0100 libxc: clearer migration v2 debug message Previous the message was like: SAVE: xc: detail: 32 bits, 3 levels xc: detail: max_pfn 0xfffff, p2m_frames 1024 xc: detail: max_mfn 0x130000 RESTORE: xc: detail: max_mfn 0x130000 xc: detail: 32 bits, 3 levels xc: detail: Expanded p2m from 0 to 0xfffff It's not immediately clear that the last line in restore messages was referring to max_pfn. Change the debug message a bit to make that clearer. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore_x86_pv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index ef26c64..c65a2f1 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -66,7 +66,7 @@ static int expand_p2m(struct xc_sr_context *ctx, unsigned long max_pfn) for ( i = (old_end_frame ? old_end_frame + 1 : 0); i <= end_frame; ++i ) ctx->x86_pv.p2m_pfns[i] = INVALID_MFN; - DPRINTF("Expanded p2m from %#lx to %#lx", old_max, max_pfn); + DPRINTF("Changed max_pfn from %#lx to %#lx", old_max, max_pfn); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaix-00089M-Dz; Wed, 09 Sep 2015 08:27:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiv-000892-V7 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:22 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 9C/5F-15765-96DEFE55; Wed, 09 Sep 2015 08:27:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1441787238!29330409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3363 invoked from network); 9 Sep 2015 08:27:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZais-00008I-Cp for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZais-0001Oa-Ar for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:18 +0000 Date: Wed, 09 Sep 2015 08:27:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: migration v2 prefix Memory -> Frames X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76d75222aa0cb4838695e7f8051f098cf9906c45 Author: Wei Liu AuthorDate: Sun Sep 6 21:05:36 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:22 2015 +0100 libxc: migration v2 prefix Memory -> Frames The prefix "Memory" is confusing because the numbers shown after that are referring to frames. Change a bunch of prefixes from "Memory" to "Frames". Also rename send_memory_verify to verify_frames. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_save.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 58667af..7dc3a48 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -451,7 +451,7 @@ static int update_progress_string(struct xc_sr_context *ctx, xc_interface *xch = ctx->xch; char *new_str = NULL; - if ( asprintf(&new_str, "Memory iteration %u of %u", + if ( asprintf(&new_str, "Frames iteration %u of %u", iter, ctx->save.max_iterations) == -1 ) { PERROR("Unable to allocate new progress string"); @@ -569,7 +569,7 @@ static int suspend_and_send_dirty(struct xc_sr_context *ctx) return rc; } -static int send_memory_verify(struct xc_sr_context *ctx) +static int verify_frames(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; @@ -586,7 +586,7 @@ static int send_memory_verify(struct xc_sr_context *ctx) if ( rc ) goto out; - xc_set_progress_prefix(xch, "Memory verify"); + xc_set_progress_prefix(xch, "Frames verify"); rc = send_all_pages(ctx); if ( rc ) goto out; @@ -629,7 +629,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( ctx->save.debug && !ctx->save.checkpointed ) { - rc = send_memory_verify(ctx); + rc = verify_frames(ctx); if ( rc ) goto out; } @@ -659,7 +659,7 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) if ( rc ) goto err; - xc_set_progress_prefix(xch, "Memory"); + xc_set_progress_prefix(xch, "Frames"); rc = send_all_pages(ctx); if ( rc ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaix-00089M-Dz; Wed, 09 Sep 2015 08:27:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaiv-000892-V7 for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:22 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 9C/5F-15765-96DEFE55; Wed, 09 Sep 2015 08:27:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1441787238!29330409!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3363 invoked from network); 9 Sep 2015 08:27:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZais-00008I-Cp for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZais-0001Oa-Ar for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:18 +0000 Date: Wed, 09 Sep 2015 08:27:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: migration v2 prefix Memory -> Frames X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 76d75222aa0cb4838695e7f8051f098cf9906c45 Author: Wei Liu AuthorDate: Sun Sep 6 21:05:36 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:22 2015 +0100 libxc: migration v2 prefix Memory -> Frames The prefix "Memory" is confusing because the numbers shown after that are referring to frames. Change a bunch of prefixes from "Memory" to "Frames". Also rename send_memory_verify to verify_frames. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_save.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 58667af..7dc3a48 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -451,7 +451,7 @@ static int update_progress_string(struct xc_sr_context *ctx, xc_interface *xch = ctx->xch; char *new_str = NULL; - if ( asprintf(&new_str, "Memory iteration %u of %u", + if ( asprintf(&new_str, "Frames iteration %u of %u", iter, ctx->save.max_iterations) == -1 ) { PERROR("Unable to allocate new progress string"); @@ -569,7 +569,7 @@ static int suspend_and_send_dirty(struct xc_sr_context *ctx) return rc; } -static int send_memory_verify(struct xc_sr_context *ctx) +static int verify_frames(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; xc_shadow_op_stats_t stats = { 0, ctx->save.p2m_size }; @@ -586,7 +586,7 @@ static int send_memory_verify(struct xc_sr_context *ctx) if ( rc ) goto out; - xc_set_progress_prefix(xch, "Memory verify"); + xc_set_progress_prefix(xch, "Frames verify"); rc = send_all_pages(ctx); if ( rc ) goto out; @@ -629,7 +629,7 @@ static int send_domain_memory_live(struct xc_sr_context *ctx) if ( ctx->save.debug && !ctx->save.checkpointed ) { - rc = send_memory_verify(ctx); + rc = verify_frames(ctx); if ( rc ) goto out; } @@ -659,7 +659,7 @@ static int send_domain_memory_nonlive(struct xc_sr_context *ctx) if ( rc ) goto err; - xc_set_progress_prefix(xch, "Memory"); + xc_set_progress_prefix(xch, "Frames"); rc = send_all_pages(ctx); if ( rc ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaj8-0008Az-GT; Wed, 09 Sep 2015 08:27:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaj6-0008Aj-Lf for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:32 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id D3/7F-04752-37DEFE55; Wed, 09 Sep 2015 08:27:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1441787249!48120314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2299 invoked from network); 9 Sep 2015 08:27:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaj3-00008Z-BK for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaj2-0001Pb-GT for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:28 +0000 Date: Wed, 09 Sep 2015 08:27:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix indentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e00f8a1a75dfb1c0ce33752e4a284fc0af3e0cf3 Author: Wei Liu AuthorDate: Sun Sep 6 21:05:37 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:29 2015 +0100 libxc: fix indentation Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore_x86_pv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index c65a2f1..bc604b3 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -970,7 +970,7 @@ static int x86_pv_localise_page(struct xc_sr_context *ctx, } if ( to_populate && populate_pfns(ctx, to_populate, pfns, NULL) ) - return -1; + return -1; for ( i = 0; i < (PAGE_SIZE / sizeof(uint64_t)); ++i ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaj8-0008Az-GT; Wed, 09 Sep 2015 08:27:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaj6-0008Aj-Lf for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:32 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id D3/7F-04752-37DEFE55; Wed, 09 Sep 2015 08:27:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1441787249!48120314!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2299 invoked from network); 9 Sep 2015 08:27:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZaj3-00008Z-BK for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZaj2-0001Pb-GT for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:28 +0000 Date: Wed, 09 Sep 2015 08:27:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: fix indentation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e00f8a1a75dfb1c0ce33752e4a284fc0af3e0cf3 Author: Wei Liu AuthorDate: Sun Sep 6 21:05:37 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:29 2015 +0100 libxc: fix indentation Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore_x86_pv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index c65a2f1..bc604b3 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -970,7 +970,7 @@ static int x86_pv_localise_page(struct xc_sr_context *ctx, } if ( to_populate && populate_pfns(ctx, to_populate, pfns, NULL) ) - return -1; + return -1; for ( i = 0; i < (PAGE_SIZE / sizeof(uint64_t)); ++i ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajH-0008CL-J8; Wed, 09 Sep 2015 08:27:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajG-0008C8-0J for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:42 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 88/5B-01421-D7DEFE55; Wed, 09 Sep 2015 08:27:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1441787259!42722857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13284 invoked from network); 9 Sep 2015 08:27:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajD-00008h-Gy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZajD-0001QV-Ek for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:39 +0000 Date: Wed, 09 Sep 2015 08:27:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't populate same pfn more than once in populate_pfns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8e9f830dc46ea2bad6919af1fdffc136dfb3aeb Author: Wei Liu AuthorDate: Sun Sep 6 21:05:38 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:30 2015 +0100 libxc: don't populate same pfn more than once in populate_pfns The original implementation of populate_pfns didn't consider the same pfn can be present multiple times in the array. The mechanism to prevent populating the same pfn multiple times only worked if the recurring pfn appeared in different batches. This bug is discovered by Linux 4.1 32 bit kernel save / restore test, which has several ptes pointing to same pfn, which results in an array containing recurring pfn. When libxc called x86_pv_localise_page, the original implementation would populate the same pfn more than once. The fix is to set bit in populated bitmap as we generate list of pfns to be populated. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index df885b6..924dd55 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -214,6 +214,9 @@ int populate_pfns(struct xc_sr_context *ctx, unsigned count, types[i] != XEN_DOMCTL_PFINFO_BROKEN))) && !pfn_is_populated(ctx, original_pfns[i]) ) { + rc = pfn_set_populated(ctx, original_pfns[i]); + if ( rc ) + goto err; pfns[nr_pfns] = mfns[nr_pfns] = original_pfns[i]; ++nr_pfns; } @@ -238,9 +241,6 @@ int populate_pfns(struct xc_sr_context *ctx, unsigned count, goto err; } - rc = pfn_set_populated(ctx, pfns[i]); - if ( rc ) - goto err; ctx->restore.ops.set_gfn(ctx, pfns[i], mfns[i]); } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajH-0008CL-J8; Wed, 09 Sep 2015 08:27:43 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajG-0008C8-0J for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:42 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 88/5B-01421-D7DEFE55; Wed, 09 Sep 2015 08:27:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1441787259!42722857!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13284 invoked from network); 9 Sep 2015 08:27:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajD-00008h-Gy for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZajD-0001QV-Ek for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:39 +0000 Date: Wed, 09 Sep 2015 08:27:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: don't populate same pfn more than once in populate_pfns X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e8e9f830dc46ea2bad6919af1fdffc136dfb3aeb Author: Wei Liu AuthorDate: Sun Sep 6 21:05:38 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:30 2015 +0100 libxc: don't populate same pfn more than once in populate_pfns The original implementation of populate_pfns didn't consider the same pfn can be present multiple times in the array. The mechanism to prevent populating the same pfn multiple times only worked if the recurring pfn appeared in different batches. This bug is discovered by Linux 4.1 32 bit kernel save / restore test, which has several ptes pointing to same pfn, which results in an array containing recurring pfn. When libxc called x86_pv_localise_page, the original implementation would populate the same pfn more than once. The fix is to set bit in populated bitmap as we generate list of pfns to be populated. Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index df885b6..924dd55 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -214,6 +214,9 @@ int populate_pfns(struct xc_sr_context *ctx, unsigned count, types[i] != XEN_DOMCTL_PFINFO_BROKEN))) && !pfn_is_populated(ctx, original_pfns[i]) ) { + rc = pfn_set_populated(ctx, original_pfns[i]); + if ( rc ) + goto err; pfns[nr_pfns] = mfns[nr_pfns] = original_pfns[i]; ++nr_pfns; } @@ -238,9 +241,6 @@ int populate_pfns(struct xc_sr_context *ctx, unsigned count, goto err; } - rc = pfn_set_populated(ctx, pfns[i]); - if ( rc ) - goto err; ctx->restore.ops.set_gfn(ctx, pfns[i], mfns[i]); } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27: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 1ZZajR-0008Dp-LV; Wed, 09 Sep 2015 08:27:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajP-0008Dc-VC for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:52 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id F7/48-00536-78DEFE55; Wed, 09 Sep 2015 08:27:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1441787269!42629995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17748 invoked from network); 9 Sep 2015 08:27:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajN-00008p-Lx for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZajN-0001RN-Ko for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:49 +0000 Date: Wed, 09 Sep 2015 08:27:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add assertion to avoid setting same bit more than once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7b39c8bd6cba3fe1c8012987b9e28bdbac7e92d Author: Wei Liu AuthorDate: Sun Sep 6 21:05:39 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:30 2015 +0100 libxc: add assertion to avoid setting same bit more than once Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 924dd55..f48e7fc 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -181,6 +181,7 @@ static int pfn_set_populated(struct xc_sr_context *ctx, xen_pfn_t pfn) ctx->restore.max_populated_pfn = new_max; } + assert(!test_bit(pfn, ctx->restore.populated_pfns)); set_bit(pfn, ctx->restore.populated_pfns); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 09 08:27:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2015 08:27: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 1ZZajR-0008Dp-LV; Wed, 09 Sep 2015 08:27:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajP-0008Dc-VC for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:52 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id F7/48-00536-78DEFE55; Wed, 09 Sep 2015 08:27:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1441787269!42629995!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17748 invoked from network); 9 Sep 2015 08:27:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Sep 2015 08:27:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZZajN-00008p-Lx for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZZajN-0001RN-Ko for xen-changelog@lists.xensource.com; Wed, 09 Sep 2015 08:27:49 +0000 Date: Wed, 09 Sep 2015 08:27:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: add assertion to avoid setting same bit more than once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a7b39c8bd6cba3fe1c8012987b9e28bdbac7e92d Author: Wei Liu AuthorDate: Sun Sep 6 21:05:39 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 7 11:54:30 2015 +0100 libxc: add assertion to avoid setting same bit more than once Signed-off-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/xc_sr_restore.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 924dd55..f48e7fc 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -181,6 +181,7 @@ static int pfn_set_populated(struct xc_sr_context *ctx, xen_pfn_t pfn) ctx->restore.max_populated_pfn = new_max; } + assert(!test_bit(pfn, ctx->restore.populated_pfns)); set_bit(pfn, ctx->restore.populated_pfns); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLz7-0002G0-LB; Fri, 11 Sep 2015 10:55:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLz6-0002Fn-5u for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:12 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 36/1C-12371-F03B2F55; Fri, 11 Sep 2015 10:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1441968909!48827435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12891 invoked from network); 11 Sep 2015 10:55:10 -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; 11 Sep 2015 10:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLz3-0005Nx-Om for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLz3-0000TR-M9 for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:09 +0000 Date: Fri, 11 Sep 2015 10:55:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] vnc: limit client_cut_text msg payload 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 112599882987da1afbbe4c16f6b049065a64f065 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:25:50 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson (cherry picked from commit dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0) (cherry picked from commit 5ae0569d964ad1a6d8dc781e5566d39210a5d063) (cherry picked from commit 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4) --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLz7-0002G0-LB; Fri, 11 Sep 2015 10:55:13 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLz6-0002Fn-5u for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:12 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 36/1C-12371-F03B2F55; Fri, 11 Sep 2015 10:55:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1441968909!48827435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12891 invoked from network); 11 Sep 2015 10:55:10 -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; 11 Sep 2015 10:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLz3-0005Nx-Om for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLz3-0000TR-M9 for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:09 +0000 Date: Fri, 11 Sep 2015 10:55:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.2-testing] vnc: limit client_cut_text msg payload 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 112599882987da1afbbe4c16f6b049065a64f065 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:25:50 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson (cherry picked from commit dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0) (cherry picked from commit 5ae0569d964ad1a6d8dc781e5566d39210a5d063) (cherry picked from commit 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4) --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.2-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzJ-0002Gq-Nq; Fri, 11 Sep 2015 10:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzI-0002Gd-CE for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:24 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 2F/7E-03763-B13B2F55; Fri, 11 Sep 2015 10:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1441968922!42231098!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23568 invoked from network); 11 Sep 2015 10:55:23 -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; 11 Sep 2015 10:55:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzF-0005Ok-Sx for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLzF-0000U7-Kx for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:21 +0000 Date: Fri, 11 Sep 2015 10:55:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] vnc: limit client_cut_text msg payload 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 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:25:47 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson (cherry picked from commit dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0) (cherry picked from commit 5ae0569d964ad1a6d8dc781e5566d39210a5d063) --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzJ-0002Gq-Nq; Fri, 11 Sep 2015 10:55:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzI-0002Gd-CE for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:24 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 2F/7E-03763-B13B2F55; Fri, 11 Sep 2015 10:55:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1441968922!42231098!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23568 invoked from network); 11 Sep 2015 10:55:23 -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; 11 Sep 2015 10:55:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzF-0005Ok-Sx for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLzF-0000U7-Kx for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:21 +0000 Date: Fri, 11 Sep 2015 10:55:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.3-testing] vnc: limit client_cut_text msg payload 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 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:25:47 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson (cherry picked from commit dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0) (cherry picked from commit 5ae0569d964ad1a6d8dc781e5566d39210a5d063) --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.3-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55: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 1ZaLzV-0002ID-QP; Fri, 11 Sep 2015 10:55:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzU-0002I6-4s for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:36 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 1C/8E-19110-723B2F55; Fri, 11 Sep 2015 10:55:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1441968933!30097938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26247 invoked from network); 11 Sep 2015 10:55:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2015 10:55:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzQ-0005Ov-Rc for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLzQ-0000VC-QD for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:32 +0000 Date: Fri, 11 Sep 2015 10:55:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] vnc: limit client_cut_text msg payload 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 5ae0569d964ad1a6d8dc781e5566d39210a5d063 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:25:40 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson (cherry picked from commit dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0) --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.4-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55: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 1ZaLzV-0002ID-QP; Fri, 11 Sep 2015 10:55:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzU-0002I6-4s for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:36 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 1C/8E-19110-723B2F55; Fri, 11 Sep 2015 10:55:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1441968933!30097938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26247 invoked from network); 11 Sep 2015 10:55:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2015 10:55:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzQ-0005Ov-Rc for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLzQ-0000VC-QD for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:32 +0000 Date: Fri, 11 Sep 2015 10:55:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.4-testing] vnc: limit client_cut_text msg payload 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 5ae0569d964ad1a6d8dc781e5566d39210a5d063 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:25:40 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson (cherry picked from commit dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0) --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.4-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzf-0002Jc-Sv; Fri, 11 Sep 2015 10:55:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLze-0002JI-6M for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:46 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id FA/57-16618-133B2F55; Fri, 11 Sep 2015 10:55:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1441968944!48800575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 466 invoked from network); 11 Sep 2015 10:55:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2015 10:55:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzb-0005P3-P0 for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLzb-0000WO-NR for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:43 +0000 Date: Fri, 11 Sep 2015 10:55:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] vnc: limit client_cut_text msg payload 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 dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:20:38 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 11 10:55:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Sep 2015 10:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzf-0002Jc-Sv; Fri, 11 Sep 2015 10:55:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLze-0002JI-6M for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:46 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id FA/57-16618-133B2F55; Fri, 11 Sep 2015 10:55:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1441968944!48800575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 466 invoked from network); 11 Sep 2015 10:55:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Sep 2015 10:55:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZaLzb-0005P3-P0 for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZaLzb-0000WO-NR for xen-changelog@lists.xensource.com; Fri, 11 Sep 2015 10:55:43 +0000 Date: Fri, 11 Sep 2015 10:55:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-4.5-testing] vnc: limit client_cut_text msg payload 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 dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0 Author: Peter Lieven AuthorDate: Mon Jun 30 10:07:54 2014 +0200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:20:38 2015 +0100 vnc: limit client_cut_text msg payload size currently a malicious client could define a payload size of 2^32 - 1 bytes and send up to that size of data to the vnc server. The server would allocated that amount of memory which could easily create an out of memory condition. This patch limits the payload size to 1MB max. Please note that client_cut_text messages are currently silently ignored. Signed-off-by: Peter Lieven Signed-off-by: Gerd Hoffmann Above is f9a70e79391f in qemu upstream. Cherry picked onto in qemu-xen-4.6-testing and qemu-xen-unstable: Conflicts: ui/vnc.c Dropped { } style changes. Signed-off-by: Ian Jackson Above is 2b5684137e81 in qemu-xen-4.6-testing and qemu-xen-unstable, now being cherry picked onto qemu-xen-4.5-testing. Also need 1c8d43cbdf0f, its fixup patch: We do not have `error_report'. Use fprintf to stderr, like the rest of the file. Fix commit message to refer to vnc.c, not ui/vnc.c. Signed-off-by: Ian Jackson --- vnc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/vnc.c b/vnc.c index 7629dfa..48e5c46 100644 --- a/vnc.c +++ b/vnc.c @@ -1768,6 +1768,12 @@ static int protocol_client_msg(VncState *vs, uint8_t *data, size_t len) if (len == 8) { uint32_t v; v = read_u32(data, 4); + if (v > (1 << 20)) { + fprintf(stderr, "vnc: client_cut_text msg payload has %u bytes" + " which exceeds our limit of 1MB.\n", v); + vnc_client_error(vs); + break; + } if (v) return 8 + v; } -- generated by git-patchbot for /home/xen/git/qemu-xen-4.5-testing.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 16 03:33:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Sep 2015 03: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 1Zc3T3-0001A3-BJ; Wed, 16 Sep 2015 03:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3T1-00019t-JQ for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:07 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 45/B7-19220-2F2E8F55; Wed, 16 Sep 2015 03:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1442374385!11057755!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29367 invoked from network); 16 Sep 2015 03:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2015 03:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3Sz-00029X-CF for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zc3Sx-0004vW-IH for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:03 +0000 Date: Wed, 16 Sep 2015 03:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe5db888dc3a14a8144ee296399ef316de563d57 Author: Ian Jackson AuthorDate: Fri Sep 11 11:49:53 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:49:53 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d571ce2..9de6813 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= cbde16cd1c9866a92a7a449e7df5637dd7c3e9cc -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TAG ?= 112599882987da1afbbe4c16f6b049065a64f065 +# Mon Jun 30 10:07:54 2014 +0200 +# vnc: limit client_cut_text msg payload size # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 16 03:33:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Sep 2015 03: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 1Zc3T3-0001A3-BJ; Wed, 16 Sep 2015 03:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3T1-00019t-JQ for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:07 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 45/B7-19220-2F2E8F55; Wed, 16 Sep 2015 03:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1442374385!11057755!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29367 invoked from network); 16 Sep 2015 03:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2015 03:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3Sz-00029X-CF for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zc3Sx-0004vW-IH for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:03 +0000 Date: Wed, 16 Sep 2015 03:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fe5db888dc3a14a8144ee296399ef316de563d57 Author: Ian Jackson AuthorDate: Fri Sep 11 11:49:53 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:49:53 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index d571ce2..9de6813 100644 --- a/Config.mk +++ b/Config.mk @@ -215,9 +215,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= cbde16cd1c9866a92a7a449e7df5637dd7c3e9cc -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TAG ?= 112599882987da1afbbe4c16f6b049065a64f065 +# Mon Jun 30 10:07:54 2014 +0200 +# vnc: limit client_cut_text msg payload size # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 16 03:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Sep 2015 03:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TD-0001B7-Df; Wed, 16 Sep 2015 03:33:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TC-0001Ay-UF for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:19 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id E8/B7-24494-EF2E8F55; Wed, 16 Sep 2015 03:33:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1442374396!32534594!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20445 invoked from network); 16 Sep 2015 03:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2015 03:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TA-00029f-Ii for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zc3T9-0004vx-H2 for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:15 +0000 Date: Wed, 16 Sep 2015 03:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: fix leak of config_data in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d4d63f26fb9e1208023a2471cb4de1194b3db03 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:43 2013 +1200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:57:28 2015 +0100 libxl: fix leak of config_data in main_cpupoolcreate Coverity-ID: 1087193 Signed-off-by: Matthew Daley Acked-by: Ian Campbell (cherry picked from commit 7737ecb20c5babff45445d27fff91894b43a2d28) (cherry picked from commit 8d394a43552434fbe62b9495b88ea8f2bfc12550) --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 666b8cd..09ee73a 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6216,6 +6216,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(config_data); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 16 03:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Sep 2015 03:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TD-0001B7-Df; Wed, 16 Sep 2015 03:33:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TC-0001Ay-UF for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:19 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id E8/B7-24494-EF2E8F55; Wed, 16 Sep 2015 03:33:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1442374396!32534594!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20445 invoked from network); 16 Sep 2015 03:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2015 03:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TA-00029f-Ii for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zc3T9-0004vx-H2 for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:15 +0000 Date: Wed, 16 Sep 2015 03:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: fix leak of config_data in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d4d63f26fb9e1208023a2471cb4de1194b3db03 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:43 2013 +1200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:57:28 2015 +0100 libxl: fix leak of config_data in main_cpupoolcreate Coverity-ID: 1087193 Signed-off-by: Matthew Daley Acked-by: Ian Campbell (cherry picked from commit 7737ecb20c5babff45445d27fff91894b43a2d28) (cherry picked from commit 8d394a43552434fbe62b9495b88ea8f2bfc12550) --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 666b8cd..09ee73a 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6216,6 +6216,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(config_data); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 16 03:33:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Sep 2015 03:33:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TN-0001Cl-GG; Wed, 16 Sep 2015 03:33:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TM-0001Cd-TK for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:29 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id EE/99-31450-803E8F55; Wed, 16 Sep 2015 03:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1442374406!35392483!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4004 invoked from network); 16 Sep 2015 03:33:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2015 03:33:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TK-00029n-Np for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zc3TK-0004wJ-MO for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:26 +0000 Date: Wed, 16 Sep 2015 03:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xl: correct handling of extra_config in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9725546765b586548bd0a6bdb567f1813e61c663 Author: Wei Liu AuthorDate: Tue Jul 14 17:41:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:57:29 2015 +0100 xl: correct handling of extra_config in main_cpupoolcreate Don't dereference extra_config if it's NULL. Don't leak extra_config in the end. Also fixed a typo in error string while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 705c9e12426cba82804cb578fc70785281655d94) (cherry picked from commit ffb4e6387f489b6b5ce287f51db43cb37ebae064) (cherry picked from commit 213e243819ba5f72e13afad41ce2f5df17715530) (cherry picked from commit f97021eb92e91db8032d600893a531863a18bd23) --- tools/libxl/xl_cmdimpl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 09ee73a..2cf9543 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6092,9 +6092,9 @@ int main_cpupoolcreate(int argc, char **argv) else config_src="command line"; - if (strlen(extra_config)) { + if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { - fprintf(stderr, "Failed to attach extra configration\n"); + fprintf(stderr, "Failed to attach extra configuration\n"); goto out; } config_data = xrealloc(config_data, @@ -6217,6 +6217,7 @@ out_cfg: xlu_cfg_destroy(config); out: free(config_data); + free(extra_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 16 03:33:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Sep 2015 03:33:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TN-0001Cl-GG; Wed, 16 Sep 2015 03:33:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TM-0001Cd-TK for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:29 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id EE/99-31450-803E8F55; Wed, 16 Sep 2015 03:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1442374406!35392483!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4004 invoked from network); 16 Sep 2015 03:33:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2015 03:33:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zc3TK-00029n-Np for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zc3TK-0004wJ-MO for xen-changelog@lists.xensource.com; Wed, 16 Sep 2015 03:33:26 +0000 Date: Wed, 16 Sep 2015 03:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] xl: correct handling of extra_config in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9725546765b586548bd0a6bdb567f1813e61c663 Author: Wei Liu AuthorDate: Tue Jul 14 17:41:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:57:29 2015 +0100 xl: correct handling of extra_config in main_cpupoolcreate Don't dereference extra_config if it's NULL. Don't leak extra_config in the end. Also fixed a typo in error string while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 705c9e12426cba82804cb578fc70785281655d94) (cherry picked from commit ffb4e6387f489b6b5ce287f51db43cb37ebae064) (cherry picked from commit 213e243819ba5f72e13afad41ce2f5df17715530) (cherry picked from commit f97021eb92e91db8032d600893a531863a18bd23) --- tools/libxl/xl_cmdimpl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 09ee73a..2cf9543 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6092,9 +6092,9 @@ int main_cpupoolcreate(int argc, char **argv) else config_src="command line"; - if (strlen(extra_config)) { + if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { - fprintf(stderr, "Failed to attach extra configration\n"); + fprintf(stderr, "Failed to attach extra configuration\n"); goto out; } config_data = xrealloc(config_data, @@ -6217,6 +6217,7 @@ out_cfg: xlu_cfg_destroy(config); out: free(config_data); + free(extra_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15: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 1ZcafP-0004gu-DP; Thu, 17 Sep 2015 15:00:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafO-0004gl-6t for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:06 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id C6/10-12946-575DAF55; Thu, 17 Sep 2015 15:00:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442502003!45289320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11305 invoked from network); 17 Sep 2015 15:00:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:00:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafL-0006tt-2h for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcafL-0006Mf-0x for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:03 +0000 Date: Thu, 17 Sep 2015 15:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Branch for 4.6: Update QEMU references X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d7fee3ac250f13da3f172a17f930f472d841865 Author: Ian Jackson AuthorDate: Wed Sep 9 13:08:15 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:08:15 2015 +0100 Branch for 4.6: Update QEMU references Refer to the 4.6-testing versions of all these. Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 59607b4..51bcf5f 100644 --- a/Config.mk +++ b/Config.mk @@ -242,14 +242,14 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.6-testing.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.6-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.6-testing.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.6-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15: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 1ZcafP-0004gu-DP; Thu, 17 Sep 2015 15:00:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafO-0004gl-6t for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:06 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id C6/10-12946-575DAF55; Thu, 17 Sep 2015 15:00:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442502003!45289320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11305 invoked from network); 17 Sep 2015 15:00:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:00:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafL-0006tt-2h for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcafL-0006Mf-0x for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:03 +0000 Date: Thu, 17 Sep 2015 15:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Branch for 4.6: Update QEMU references X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d7fee3ac250f13da3f172a17f930f472d841865 Author: Ian Jackson AuthorDate: Wed Sep 9 13:08:15 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:08:15 2015 +0100 Branch for 4.6: Update QEMU references Refer to the 4.6-testing versions of all these. Signed-off-by: Ian Jackson --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 59607b4..51bcf5f 100644 --- a/Config.mk +++ b/Config.mk @@ -242,14 +242,14 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.6-testing.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.6-testing.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-unstable.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.6-testing.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.6-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00: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 1Zcafa-0004hr-Fy; Thu, 17 Sep 2015 15:00:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafZ-0004hj-Lf for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:17 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id FD/34-19110-185DAF55; Thu, 17 Sep 2015 15:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442502014!48377616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18175 invoked from network); 17 Sep 2015 15:00:15 -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; 17 Sep 2015 15:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafW-0006tx-2V for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcafV-0006N9-6C for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:13 +0000 Date: Thu, 17 Sep 2015 15:00:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] MAINTAINERS: stable backports should be requested on xen-devel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddd9d77e826165590595385fa5e00d61291bfdd0 Author: Ian Campbell AuthorDate: Sat Jul 25 08:28:58 2015 +0000 Commit: Ian Jackson CommitDate: Wed Sep 9 13:13:10 2015 +0100 MAINTAINERS: stable backports should be requested on xen-devel As well as CC-ing the correct people. I just saw such a request on xen-users and thought this was worth clarifying here too. Signed-off-by: Ian Campbell (cherry picked from commit 664675adece8e6c4220c3bd22b1f78bea7e630b1) --- MAINTAINERS | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a7fad84..a6bece6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,10 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Backport requests should be made on the xen-devel@lists.xenproject.org +list. Remember to copy the appropriate stable branch maintainer who +will be listed in this section of the MAINTAINERS file in the +appropriate branch. Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00: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 1Zcafa-0004hr-Fy; Thu, 17 Sep 2015 15:00:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafZ-0004hj-Lf for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:17 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id FD/34-19110-185DAF55; Thu, 17 Sep 2015 15:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442502014!48377616!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18175 invoked from network); 17 Sep 2015 15:00:15 -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; 17 Sep 2015 15:00:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcafW-0006tx-2V for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcafV-0006N9-6C for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:13 +0000 Date: Thu, 17 Sep 2015 15:00:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] MAINTAINERS: stable backports should be requested on xen-devel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddd9d77e826165590595385fa5e00d61291bfdd0 Author: Ian Campbell AuthorDate: Sat Jul 25 08:28:58 2015 +0000 Commit: Ian Jackson CommitDate: Wed Sep 9 13:13:10 2015 +0100 MAINTAINERS: stable backports should be requested on xen-devel As well as CC-ing the correct people. I just saw such a request on xen-users and thought this was worth clarifying here too. Signed-off-by: Ian Campbell (cherry picked from commit 664675adece8e6c4220c3bd22b1f78bea7e630b1) --- MAINTAINERS | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a7fad84..a6bece6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,10 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Backport requests should be made on the xen-devel@lists.xenproject.org +list. Remember to copy the appropriate stable branch maintainer who +will be listed in this section of the MAINTAINERS file in the +appropriate branch. Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00: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 1Zcafj-0004jE-Ih; Thu, 17 Sep 2015 15:00:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcafi-0004iw-Fa for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:26 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 80/6C-02380-985DAF55; Thu, 17 Sep 2015 15:00:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1442502024!3778826!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3097 invoked from network); 17 Sep 2015 15:00:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcafg-0006u9-72 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcafg-0006NV-5W for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:24 +0000 Date: Thu, 17 Sep 2015 15:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Branch for 4.6: Document stable tree 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 5af5c1ad4c1ef288d3e7e1c16b05986f301b0f67 Author: Ian Jackson AuthorDate: Wed Sep 9 13:14:37 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:14:37 2015 +0100 Branch for 4.6: Document stable tree MAINTAINERS --- MAINTAINERS | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a6bece6..af77e30 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -50,9 +50,16 @@ Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. Backport requests should be made on the xen-devel@lists.xenproject.org -list. Remember to copy the appropriate stable branch maintainer who -will be listed in this section of the MAINTAINERS file in the -appropriate branch. +list. Remember to copy the appropriate stable branch maintainer. + +The maintainer for this branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson + Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00: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 1Zcafj-0004jE-Ih; Thu, 17 Sep 2015 15:00:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcafi-0004iw-Fa for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:26 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 80/6C-02380-985DAF55; Thu, 17 Sep 2015 15:00:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1442502024!3778826!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3097 invoked from network); 17 Sep 2015 15:00:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:00:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcafg-0006u9-72 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcafg-0006NV-5W for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:24 +0000 Date: Thu, 17 Sep 2015 15:00:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Branch for 4.6: Document stable tree 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 5af5c1ad4c1ef288d3e7e1c16b05986f301b0f67 Author: Ian Jackson AuthorDate: Wed Sep 9 13:14:37 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:14:37 2015 +0100 Branch for 4.6: Document stable tree MAINTAINERS --- MAINTAINERS | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a6bece6..af77e30 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -50,9 +50,16 @@ Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. Backport requests should be made on the xen-devel@lists.xenproject.org -list. Remember to copy the appropriate stable branch maintainer who -will be listed in this section of the MAINTAINERS file in the -appropriate branch. +list. Remember to copy the appropriate stable branch maintainer. + +The maintainer for this branch is: + + Jan Beulich + +Tools backport requests should also be copied to: + + Ian Jackson + Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15: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 1Zcafu-0004kn-LK; Thu, 17 Sep 2015 15: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 1Zcaft-0004kZ-A9 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:37 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 05/6D-01143-495DAF55; Thu, 17 Sep 2015 15:00:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1442502034!50676050!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31034 invoked from network); 17 Sep 2015 15:00:35 -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; 17 Sep 2015 15:00:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcafq-0006uH-Bf for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcafq-0006Ob-9e for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:34 +0000 Date: Thu, 17 Sep 2015 15:00:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] efi: introduce efi_arch_flush_dcache_area X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7e711e49e1b47bca7b2bb65c8b7b2651b8cc094 Author: Stefano Stabellini AuthorDate: Wed Sep 9 16:16:32 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:16:32 2015 +0200 efi: introduce efi_arch_flush_dcache_area Objects loaded by FileHandle->Read need to be flushed from dcache, otherwise copy_from_paddr will read stale data when copying the kernel, causing a failure to boot. Introduce efi_arch_flush_dcache_area and call it from read_file. This commit introduces no functional changes on x86. Reported-by: Mark Rutland Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Release-acked-by: Wei Liu master commit: 0d6a3c755374f04f6dd25373da28291a8f35bede master date: 2015-09-09 15:29:06 +0200 --- xen/arch/arm/efi/efi-boot.h | 7 +++++++ xen/arch/x86/efi/efi-boot.h | 2 ++ xen/common/efi/boot.c | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 6a12d91..e427e5f 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -9,6 +9,7 @@ #include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); +void __flush_dcache_area(const void *vaddr, unsigned long size); #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -571,6 +572,12 @@ static void __init efi_arch_video_init(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop, EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info) { } + +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) +{ + __flush_dcache_area(vaddr, size); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 2dd69f6..4c7f383 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -640,6 +640,8 @@ static bool_t __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) return 1; /* x86 always uses a config file */ } +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { } + /* * Local variables: * mode: C diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 75a939f..2bc5b25 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -528,6 +528,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, PrintErrMesg(name, ret); } + efi_arch_flush_dcache_area(file->ptr, file->size); + return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15: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 1Zcafu-0004kn-LK; Thu, 17 Sep 2015 15: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 1Zcaft-0004kZ-A9 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:37 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 05/6D-01143-495DAF55; Thu, 17 Sep 2015 15:00:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1442502034!50676050!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31034 invoked from network); 17 Sep 2015 15:00:35 -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; 17 Sep 2015 15:00:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcafq-0006uH-Bf for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcafq-0006Ob-9e for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:34 +0000 Date: Thu, 17 Sep 2015 15:00:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] efi: introduce efi_arch_flush_dcache_area X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7e711e49e1b47bca7b2bb65c8b7b2651b8cc094 Author: Stefano Stabellini AuthorDate: Wed Sep 9 16:16:32 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:16:32 2015 +0200 efi: introduce efi_arch_flush_dcache_area Objects loaded by FileHandle->Read need to be flushed from dcache, otherwise copy_from_paddr will read stale data when copying the kernel, causing a failure to boot. Introduce efi_arch_flush_dcache_area and call it from read_file. This commit introduces no functional changes on x86. Reported-by: Mark Rutland Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Release-acked-by: Wei Liu master commit: 0d6a3c755374f04f6dd25373da28291a8f35bede master date: 2015-09-09 15:29:06 +0200 --- xen/arch/arm/efi/efi-boot.h | 7 +++++++ xen/arch/x86/efi/efi-boot.h | 2 ++ xen/common/efi/boot.c | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 6a12d91..e427e5f 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -9,6 +9,7 @@ #include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); +void __flush_dcache_area(const void *vaddr, unsigned long size); #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -571,6 +572,12 @@ static void __init efi_arch_video_init(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop, EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info) { } + +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) +{ + __flush_dcache_area(vaddr, size); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 2dd69f6..4c7f383 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -640,6 +640,8 @@ static bool_t __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) return 1; /* x86 always uses a config file */ } +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { } + /* * Local variables: * mode: C diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 75a939f..2bc5b25 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -528,6 +528,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, PrintErrMesg(name, ret); } + efi_arch_flush_dcache_area(file->ptr, file->size); + return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcag3-0004mQ-Nx; Thu, 17 Sep 2015 15:00:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcag3-0004mC-75 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:47 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 85/BD-01143-E95DAF55; Thu, 17 Sep 2015 15:00:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1442502044!50711305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21674 invoked from network); 17 Sep 2015 15:00:45 -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; 17 Sep 2015 15:00:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcag0-0006uP-Ia for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcag0-0006P8-GB for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:44 +0000 Date: Thu, 17 Sep 2015 15:00:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/VPMU: Set VPMU context pointer to NULL when freeing it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33ad644b4236ecc1008b03cd0cac9b9b61877fb5 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 16:17:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:17:12 2015 +0200 x86/VPMU: Set VPMU context pointer to NULL when freeing it Otherwise we may hit assertion in vpmu_initialise() if vcpu is offlined and then onlined again. For tidyness, set priv_context to NULL as well. Signed-off-by: Boris Ostrovsky Reviewed-by: Dietmar Hahn Release-acked-by: Wei Liu master commit: 0b5fd6433f54281f3bffd79f2d759dd0edc1f3ab master date: 2015-09-09 15:32:00 +0200 --- xen/arch/x86/cpu/vpmu_amd.c | 2 ++ xen/arch/x86/cpu/vpmu_intel.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 825be72..04da81a 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -438,6 +438,8 @@ static void amd_vpmu_destroy(struct vcpu *v) amd_vpmu_unset_msr_bitmap(v); xfree(vpmu->context); + vpmu->context = NULL; + vpmu->priv_context = NULL; if ( vpmu_is_set(vpmu, VPMU_RUNNING) ) release_pmu_ownship(PMU_OWNER_HVM); diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index b3750d7..12f80ae 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -828,7 +828,9 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); xfree(vpmu->context); + vpmu->context = NULL; xfree(vpmu->priv_context); + vpmu->priv_context = NULL; if ( has_hvm_container_vcpu(v) && cpu_has_vmx_msr_bitmap ) core2_vpmu_unset_msr_bitmap(v->arch.hvm_vmx.msr_bitmap); release_pmu_ownship(PMU_OWNER_HVM); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcag3-0004mQ-Nx; Thu, 17 Sep 2015 15:00:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcag3-0004mC-75 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:47 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 85/BD-01143-E95DAF55; Thu, 17 Sep 2015 15:00:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1442502044!50711305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21674 invoked from network); 17 Sep 2015 15:00:45 -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; 17 Sep 2015 15:00:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcag0-0006uP-Ia for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcag0-0006P8-GB for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:44 +0000 Date: Thu, 17 Sep 2015 15:00:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/VPMU: Set VPMU context pointer to NULL when freeing it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33ad644b4236ecc1008b03cd0cac9b9b61877fb5 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 16:17:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:17:12 2015 +0200 x86/VPMU: Set VPMU context pointer to NULL when freeing it Otherwise we may hit assertion in vpmu_initialise() if vcpu is offlined and then onlined again. For tidyness, set priv_context to NULL as well. Signed-off-by: Boris Ostrovsky Reviewed-by: Dietmar Hahn Release-acked-by: Wei Liu master commit: 0b5fd6433f54281f3bffd79f2d759dd0edc1f3ab master date: 2015-09-09 15:32:00 +0200 --- xen/arch/x86/cpu/vpmu_amd.c | 2 ++ xen/arch/x86/cpu/vpmu_intel.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 825be72..04da81a 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -438,6 +438,8 @@ static void amd_vpmu_destroy(struct vcpu *v) amd_vpmu_unset_msr_bitmap(v); xfree(vpmu->context); + vpmu->context = NULL; + vpmu->priv_context = NULL; if ( vpmu_is_set(vpmu, VPMU_RUNNING) ) release_pmu_ownship(PMU_OWNER_HVM); diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index b3750d7..12f80ae 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -828,7 +828,9 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); xfree(vpmu->context); + vpmu->context = NULL; xfree(vpmu->priv_context); + vpmu->priv_context = NULL; if ( has_hvm_container_vcpu(v) && cpu_has_vmx_msr_bitmap ) core2_vpmu_unset_msr_bitmap(v->arch.hvm_vmx.msr_bitmap); release_pmu_ownship(PMU_OWNER_HVM); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00: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 1ZcagE-0004oV-Qg; Thu, 17 Sep 2015 15:00:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagD-0004oF-L0 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:57 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id BC/E8-00536-8A5DAF55; Thu, 17 Sep 2015 15:00:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442502054!45289768!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23201 invoked from network); 17 Sep 2015 15:00:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:00:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagA-0006uX-NO for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcagA-0006Pc-MD for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:54 +0000 Date: Thu, 17 Sep 2015 15:00:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Config.mk: Non-debug build by default. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb5599f7fa2a5b4b98acc0fb37dbafbd73dea022 Author: Ian Jackson AuthorDate: Wed Sep 9 16:22:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 16:22:39 2015 +0100 Config.mk: Non-debug build by default. Set debug ?= n, in preperation for late RCs and eventual release. Signed-off-by: Ian Jackson CC: Wei Liu --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 51bcf5f..403d0fd 100644 --- a/Config.mk +++ b/Config.mk @@ -17,7 +17,7 @@ or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$( -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:00:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:00: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 1ZcagE-0004oV-Qg; Thu, 17 Sep 2015 15:00:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagD-0004oF-L0 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:57 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id BC/E8-00536-8A5DAF55; Thu, 17 Sep 2015 15:00:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442502054!45289768!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23201 invoked from network); 17 Sep 2015 15:00:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:00:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagA-0006uX-NO for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcagA-0006Pc-MD for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:00:54 +0000 Date: Thu, 17 Sep 2015 15:00:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Config.mk: Non-debug build by default. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cb5599f7fa2a5b4b98acc0fb37dbafbd73dea022 Author: Ian Jackson AuthorDate: Wed Sep 9 16:22:07 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 16:22:39 2015 +0100 Config.mk: Non-debug build by default. Set debug ?= n, in preperation for late RCs and eventual release. Signed-off-by: Ian Jackson CC: Wei Liu --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 51bcf5f..403d0fd 100644 --- a/Config.mk +++ b/Config.mk @@ -17,7 +17,7 @@ or = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip $(3)),$( -include $(XEN_ROOT)/.config # A debug build of Xen and tools? -debug ?= y +debug ?= n debug_symbols ?= $(debug) # Test coverage support -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1ZcagO-0004qA-TO; Thu, 17 Sep 2015 15:01:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagN-0004px-Ca for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:07 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id F1/36-15765-2B5DAF55; Thu, 17 Sep 2015 15:01:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1442502065!50621625!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25495 invoked from network); 17 Sep 2015 15:01:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:01:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagK-0006v9-Tc for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcagK-0006Q8-RU for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:04 +0000 Date: Thu, 17 Sep 2015 15:01:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] configure: don't silently disable systemd support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4cebfd144ebf9e833a71e64c68b4745196d6b5b Author: Wei Liu AuthorDate: Thu Sep 10 12:18:03 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:58 2015 +0100 configure: don't silently disable systemd support Originally when user runs ./configure --enable-systemd and systemd development library is not available the build system silently disables systemd support. This is not in line with normal expectation. Instead, configure should error out when user has asked for systemd support but development libraries can't be found. Reported-by: George Dunlap Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 250f988c6c41004bd46990edb9d5662bb606cf92) --- m4/systemd.m4 | 6 +++++- tools/configure | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 8284993..e4b1aa5 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -85,7 +85,11 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled]) systemd=y AX_CHECK_SYSTEMD_LIBS() - ],[systemd=n]) + ],[ + AS_IF([test "x$enable_systemd" = "xyes"], + [AC_MSG_ERROR([Unable to find systemd development library])], + [systemd=n]) + ]) ],[systemd=n]) ]) diff --git a/tools/configure b/tools/configure index 884ce0a..aa66876 100755 --- a/tools/configure +++ b/tools/configure @@ -9318,9 +9318,15 @@ fi else + + if test "x$enable_systemd" = "xyes"; then : + as_fn_error $? "Unable to find systemd development library" "$LINENO" 5 +else systemd=n fi +fi + else systemd=n fi -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1ZcagO-0004qA-TO; Thu, 17 Sep 2015 15:01:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagN-0004px-Ca for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:07 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id F1/36-15765-2B5DAF55; Thu, 17 Sep 2015 15:01:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1442502065!50621625!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25495 invoked from network); 17 Sep 2015 15:01:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:01:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagK-0006v9-Tc for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcagK-0006Q8-RU for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:04 +0000 Date: Thu, 17 Sep 2015 15:01:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] configure: don't silently disable systemd support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4cebfd144ebf9e833a71e64c68b4745196d6b5b Author: Wei Liu AuthorDate: Thu Sep 10 12:18:03 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:58 2015 +0100 configure: don't silently disable systemd support Originally when user runs ./configure --enable-systemd and systemd development library is not available the build system silently disables systemd support. This is not in line with normal expectation. Instead, configure should error out when user has asked for systemd support but development libraries can't be found. Reported-by: George Dunlap Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 250f988c6c41004bd46990edb9d5662bb606cf92) --- m4/systemd.m4 | 6 +++++- tools/configure | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 8284993..e4b1aa5 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -85,7 +85,11 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled]) systemd=y AX_CHECK_SYSTEMD_LIBS() - ],[systemd=n]) + ],[ + AS_IF([test "x$enable_systemd" = "xyes"], + [AC_MSG_ERROR([Unable to find systemd development library])], + [systemd=n]) + ]) ],[systemd=n]) ]) diff --git a/tools/configure b/tools/configure index 884ce0a..aa66876 100755 --- a/tools/configure +++ b/tools/configure @@ -9318,9 +9318,15 @@ fi else + + if test "x$enable_systemd" = "xyes"; then : + as_fn_error $? "Unable to find systemd development library" "$LINENO" 5 +else systemd=n fi +fi + else systemd=n fi -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1ZcagY-0004rd-Vx; Thu, 17 Sep 2015 15:01:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagY-0004rO-2q for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:18 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 13/FA-32641-DB5DAF55; Thu, 17 Sep 2015 15:01:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442502075!44049731!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27355 invoked from network); 17 Sep 2015 15:01:16 -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 Sep 2015 15:01:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagV-0006vL-7R for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcagV-0006Qc-1w for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:15 +0000 Date: Thu, 17 Sep 2015 15:01:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: set ret to non-zero value in failure path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0c5ff5e10ffd9c31c37b4e92382bd51392f902d Author: Wei Liu AuthorDate: Wed Sep 9 18:03:36 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:58 2015 +0100 libxl: set ret to non-zero value in failure path ... otherwise we have something like: xl: libxl_create.c:968: initiate_domain_create: Assertion `ret' failed. Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 63ac1c01f3c5a9afb2c4ef3e6c44eb973cfca7e9) --- tools/libxl/libxl_create.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5128160..29c2641 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -865,6 +865,7 @@ static void initiate_domain_create(libxl__egc *egc, */ if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && d_config->b_info.num_vnuma_nodes) { + ret = ERROR_INVAL; LOG(ERROR, "PV vNUMA is not yet supported"); goto error_out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1ZcagY-0004rd-Vx; Thu, 17 Sep 2015 15:01:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagY-0004rO-2q for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:18 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 13/FA-32641-DB5DAF55; Thu, 17 Sep 2015 15:01:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442502075!44049731!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27355 invoked from network); 17 Sep 2015 15:01:16 -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 Sep 2015 15:01:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcagV-0006vL-7R for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcagV-0006Qc-1w for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:15 +0000 Date: Thu, 17 Sep 2015 15:01:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: set ret to non-zero value in failure path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b0c5ff5e10ffd9c31c37b4e92382bd51392f902d Author: Wei Liu AuthorDate: Wed Sep 9 18:03:36 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:58 2015 +0100 libxl: set ret to non-zero value in failure path ... otherwise we have something like: xl: libxl_create.c:968: initiate_domain_create: Assertion `ret' failed. Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 63ac1c01f3c5a9afb2c4ef3e6c44eb973cfca7e9) --- tools/libxl/libxl_create.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5128160..29c2641 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -865,6 +865,7 @@ static void initiate_domain_create(libxl__egc *egc, */ if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && d_config->b_info.num_vnuma_nodes) { + ret = ERROR_INVAL; LOG(ERROR, "PV vNUMA is not yet supported"); goto error_out; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagj-0004ud-KE; Thu, 17 Sep 2015 15:01:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagi-0004uG-3P for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 31/F6-15765-7C5DAF55; Thu, 17 Sep 2015 15:01:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1442502085!50671811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18201 invoked from network); 17 Sep 2015 15:01:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:01:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagf-0006vX-C5 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcagf-0006RD-B0 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:25 +0000 Date: Thu, 17 Sep 2015 15:01:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b6d907c5a170668b245caae580ee7193838d6d9 Author: Ian Jackson AuthorDate: Fri Sep 11 11:18:27 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:18:27 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 403d0fd..77f83a2 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 5cdde31eacdd288359746019ad05cac8ed5d9f70 -# Fri Aug 28 15:53:40 2015 +0100 -# HVM: atomically access pointers in bufioreq handling +QEMU_TRADITIONAL_REVISION ?= 1c8d43cbdf0fc01a8f05acfbf55b805a83da34bb +# Tue Sep 8 15:41:20 2015 +0100 +# Fix build after "ui/vnc: limit client_cut_text msg payload size" # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagj-0004ud-KE; Thu, 17 Sep 2015 15:01:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagi-0004uG-3P for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:28 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 31/F6-15765-7C5DAF55; Thu, 17 Sep 2015 15:01:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1442502085!50671811!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18201 invoked from network); 17 Sep 2015 15:01:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:01:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagf-0006vX-C5 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcagf-0006RD-B0 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:25 +0000 Date: Thu, 17 Sep 2015 15:01:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b6d907c5a170668b245caae580ee7193838d6d9 Author: Ian Jackson AuthorDate: Fri Sep 11 11:18:27 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:18:27 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 403d0fd..77f83a2 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 5cdde31eacdd288359746019ad05cac8ed5d9f70 -# Fri Aug 28 15:53:40 2015 +0100 -# HVM: atomically access pointers in bufioreq handling +QEMU_TRADITIONAL_REVISION ?= 1c8d43cbdf0fc01a8f05acfbf55b805a83da34bb +# Tue Sep 8 15:41:20 2015 +0100 +# Fix build after "ui/vnc: limit client_cut_text msg payload size" # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1Zcagu-0004xQ-NK; Thu, 17 Sep 2015 15:01:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagt-0004wx-3T for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:39 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id C7/32-05979-1D5DAF55; Thu, 17 Sep 2015 15:01:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442502095!45172748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20966 invoked from network); 17 Sep 2015 15:01:36 -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; 17 Sep 2015 15:01:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagp-0006vf-Ij for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcagp-0006S6-Gu for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:35 +0000 Date: Thu, 17 Sep 2015 15:01:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 457614700934daf0e5053e1acccb0261607472c0 Author: Ian Campbell AuthorDate: Fri Sep 11 11:42:51 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 15:10:58 2015 +0100 libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards The fd passed to us by libvirt for both save and restore has at least O_NONBLOCK set, which libxl does not expect and therefore fails to handle any EAGAIN which might arise. This has been observed with migration v2, but if v1 used to work I think that would be just be by luck and/or coincidence. Unix convention (and the principal of least surprise) is usually to ensure that an fd has no "strange" properties, such as being non-blocking, when handing it to another component. However for the convenience of the application arrange instead for libxl to clear any unexpected flags on the file descriptors it is given for save or restore and restore them to their original state at the end. O_NDELAY could be similarly problematic so clear that as well as O_NONBLOCK. To do this introduce a pair of new helper functions one to modify+save the flags and another to restore them and call them in the appropriate places. The migration v1 code appeared to do some things with O_NONBLOCK in the checkpoint case. Migration v2 doesn't seem to do so, and in any case I wouldn't expect it to be relying on libvirt's setting of O_NONBLOCK when xl doesn't use that flag. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu Cc: Jim Fehlig Cc: Andrew Cooper Cc: Shriram Rajagopalan Cc: Yang Hongyang (cherry picked from commit 93f5194e72708776783f2d34894c9b42031e116e) --- tools/libxl/libxl.c | 65 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_create.c | 23 ++++++++++++++- tools/libxl/libxl_internal.h | 13 ++++++++ 3 files changed, 100 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 10d1909..6ebb96e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -952,6 +952,12 @@ static void domain_suspend_cb(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { STATE_AO_GC(dss->ao); + int flrc; + + flrc = libxl__fd_flags_restore(gc, dss->fd, dss->fdfl); + /* If suspend has failed already then report that error not this one. */ + if (flrc && !rc) rc = flrc; + libxl__ao_complete(egc,ao,rc); } @@ -980,6 +986,11 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, dss->live = flags & LIBXL_SUSPEND_LIVE; dss->debug = flags & LIBXL_SUSPEND_DEBUG; + rc = libxl__fd_flags_modify_save(gc, dss->fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &dss->fdfl); + if (rc < 0) goto out_err; + libxl__domain_save(egc, dss); return AO_INPROGRESS; @@ -6507,6 +6518,60 @@ int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } +int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags) +{ + int rc, ret, fdfl; + + fdfl = fcntl(fd, F_GETFL); + if (fdfl < 0) { + LOGE(ERROR, "failed to fcntl.F_GETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + + if (r_oldflags) + *r_oldflags = fdfl; + + fdfl &= mask; + fdfl |= val; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; +} + +int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) +{ + int ret, rc; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; + +} void libxl_hwcap_copy(libxl_ctx *ctx,libxl_hwcap *dst, libxl_hwcap *src) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 29c2641..f5771da 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1556,6 +1556,7 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, { AO_CREATE(ctx, 0, ao_how); libxl__app_domain_create_state *cdcs; + int rc; GCNEW(cdcs); cdcs->dcs.ao = ao; @@ -1563,8 +1564,13 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_domain_config_init(&cdcs->dcs.guest_config_saved); libxl_domain_config_copy(ctx, &cdcs->dcs.guest_config_saved, d_config); cdcs->dcs.restore_fd = cdcs->dcs.libxc_fd = restore_fd; - if (restore_fd > -1) + if (restore_fd > -1) { cdcs->dcs.restore_params = *params; + rc = libxl__fd_flags_modify_save(gc, cdcs->dcs.restore_fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &cdcs->dcs.restore_fdfl); + if (rc < 0) goto out_err; + } cdcs->dcs.callback = domain_create_cb; libxl__ao_progress_gethow(&cdcs->dcs.aop_console_how, aop_console_how); cdcs->domid_out = domid; @@ -1572,6 +1578,10 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, initiate_domain_create(egc, &cdcs->dcs); return AO_INPROGRESS; + + out_err: + return AO_CREATE_FAIL(rc); + } static void domain_create_cb(libxl__egc *egc, @@ -1579,10 +1589,21 @@ static void domain_create_cb(libxl__egc *egc, int rc, uint32_t domid) { libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); + int flrc; STATE_AO_GC(cdcs->dcs.ao); *cdcs->domid_out = domid; + if (dcs->restore_fd > -1) { + flrc = libxl__fd_flags_restore(gc, + dcs->restore_fd, dcs->restore_fdfl); + /* + * If restore has failed already then report that error not + * this one. + */ + if (flrc && !rc) rc = flrc; + } + libxl__ao_complete(egc, ao, rc); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6ea6c83..1699f32 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -630,6 +630,17 @@ _hidden int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]); * `not open'. Ignores any errors. Sets fds[] to -1. */ _hidden void libxl__pipe_close(int fds[2]); +/* Change the flags for the file description associated with fd to + * (flags & mask) | val. + * If r_oldflags != NULL then sets *r_oldflags to the original set of + * flags. + */ +_hidden int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags); +/* Restores the flags for the file description associated with fd to + * to the previous value (returned by libxl__fd_flags_modify_save) + */ +_hidden int libxl__fd_flags_restore(libxl__gc *gc, int fd, int old_flags); /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. @@ -3049,6 +3060,7 @@ struct libxl__domain_suspend_state { uint32_t domid; int fd; + int fdfl; /* original flags on fd */ libxl_domain_type type; int live; int debug; @@ -3390,6 +3402,7 @@ struct libxl__domain_create_state { libxl_domain_config *guest_config; libxl_domain_config guest_config_saved; /* vanilla config */ int restore_fd, libxc_fd; + int restore_fdfl; /* original flags of restore_fd */ libxl_domain_restore_params restore_params; libxl__domain_create_cb *callback; libxl_asyncprogress_how aop_console_how; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1Zcagu-0004xQ-NK; Thu, 17 Sep 2015 15:01:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagt-0004wx-3T for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:39 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id C7/32-05979-1D5DAF55; Thu, 17 Sep 2015 15:01:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442502095!45172748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20966 invoked from network); 17 Sep 2015 15:01:36 -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; 17 Sep 2015 15:01:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcagp-0006vf-Ij for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcagp-0006S6-Gu for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:35 +0000 Date: Thu, 17 Sep 2015 15:01:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 457614700934daf0e5053e1acccb0261607472c0 Author: Ian Campbell AuthorDate: Fri Sep 11 11:42:51 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 15:10:58 2015 +0100 libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards The fd passed to us by libvirt for both save and restore has at least O_NONBLOCK set, which libxl does not expect and therefore fails to handle any EAGAIN which might arise. This has been observed with migration v2, but if v1 used to work I think that would be just be by luck and/or coincidence. Unix convention (and the principal of least surprise) is usually to ensure that an fd has no "strange" properties, such as being non-blocking, when handing it to another component. However for the convenience of the application arrange instead for libxl to clear any unexpected flags on the file descriptors it is given for save or restore and restore them to their original state at the end. O_NDELAY could be similarly problematic so clear that as well as O_NONBLOCK. To do this introduce a pair of new helper functions one to modify+save the flags and another to restore them and call them in the appropriate places. The migration v1 code appeared to do some things with O_NONBLOCK in the checkpoint case. Migration v2 doesn't seem to do so, and in any case I wouldn't expect it to be relying on libvirt's setting of O_NONBLOCK when xl doesn't use that flag. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu Cc: Jim Fehlig Cc: Andrew Cooper Cc: Shriram Rajagopalan Cc: Yang Hongyang (cherry picked from commit 93f5194e72708776783f2d34894c9b42031e116e) --- tools/libxl/libxl.c | 65 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_create.c | 23 ++++++++++++++- tools/libxl/libxl_internal.h | 13 ++++++++ 3 files changed, 100 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 10d1909..6ebb96e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -952,6 +952,12 @@ static void domain_suspend_cb(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { STATE_AO_GC(dss->ao); + int flrc; + + flrc = libxl__fd_flags_restore(gc, dss->fd, dss->fdfl); + /* If suspend has failed already then report that error not this one. */ + if (flrc && !rc) rc = flrc; + libxl__ao_complete(egc,ao,rc); } @@ -980,6 +986,11 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, dss->live = flags & LIBXL_SUSPEND_LIVE; dss->debug = flags & LIBXL_SUSPEND_DEBUG; + rc = libxl__fd_flags_modify_save(gc, dss->fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &dss->fdfl); + if (rc < 0) goto out_err; + libxl__domain_save(egc, dss); return AO_INPROGRESS; @@ -6507,6 +6518,60 @@ int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } +int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags) +{ + int rc, ret, fdfl; + + fdfl = fcntl(fd, F_GETFL); + if (fdfl < 0) { + LOGE(ERROR, "failed to fcntl.F_GETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + + if (r_oldflags) + *r_oldflags = fdfl; + + fdfl &= mask; + fdfl |= val; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; +} + +int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) +{ + int ret, rc; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; + +} void libxl_hwcap_copy(libxl_ctx *ctx,libxl_hwcap *dst, libxl_hwcap *src) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 29c2641..f5771da 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1556,6 +1556,7 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, { AO_CREATE(ctx, 0, ao_how); libxl__app_domain_create_state *cdcs; + int rc; GCNEW(cdcs); cdcs->dcs.ao = ao; @@ -1563,8 +1564,13 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_domain_config_init(&cdcs->dcs.guest_config_saved); libxl_domain_config_copy(ctx, &cdcs->dcs.guest_config_saved, d_config); cdcs->dcs.restore_fd = cdcs->dcs.libxc_fd = restore_fd; - if (restore_fd > -1) + if (restore_fd > -1) { cdcs->dcs.restore_params = *params; + rc = libxl__fd_flags_modify_save(gc, cdcs->dcs.restore_fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &cdcs->dcs.restore_fdfl); + if (rc < 0) goto out_err; + } cdcs->dcs.callback = domain_create_cb; libxl__ao_progress_gethow(&cdcs->dcs.aop_console_how, aop_console_how); cdcs->domid_out = domid; @@ -1572,6 +1578,10 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, initiate_domain_create(egc, &cdcs->dcs); return AO_INPROGRESS; + + out_err: + return AO_CREATE_FAIL(rc); + } static void domain_create_cb(libxl__egc *egc, @@ -1579,10 +1589,21 @@ static void domain_create_cb(libxl__egc *egc, int rc, uint32_t domid) { libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); + int flrc; STATE_AO_GC(cdcs->dcs.ao); *cdcs->domid_out = domid; + if (dcs->restore_fd > -1) { + flrc = libxl__fd_flags_restore(gc, + dcs->restore_fd, dcs->restore_fdfl); + /* + * If restore has failed already then report that error not + * this one. + */ + if (flrc && !rc) rc = flrc; + } + libxl__ao_complete(egc, ao, rc); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6ea6c83..1699f32 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -630,6 +630,17 @@ _hidden int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]); * `not open'. Ignores any errors. Sets fds[] to -1. */ _hidden void libxl__pipe_close(int fds[2]); +/* Change the flags for the file description associated with fd to + * (flags & mask) | val. + * If r_oldflags != NULL then sets *r_oldflags to the original set of + * flags. + */ +_hidden int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags); +/* Restores the flags for the file description associated with fd to + * to the previous value (returned by libxl__fd_flags_modify_save) + */ +_hidden int libxl__fd_flags_restore(libxl__gc *gc, int fd, int old_flags); /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. @@ -3049,6 +3060,7 @@ struct libxl__domain_suspend_state { uint32_t domid; int fd; + int fdfl; /* original flags on fd */ libxl_domain_type type; int live; int debug; @@ -3390,6 +3402,7 @@ struct libxl__domain_create_state { libxl_domain_config *guest_config; libxl_domain_config guest_config_saved; /* vanilla config */ int restore_fd, libxc_fd; + int restore_fdfl; /* original flags of restore_fd */ libxl_domain_restore_params restore_params; libxl__domain_create_cb *callback; libxl_asyncprogress_how aop_console_how; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1Zcah3-0004zW-Q9; Thu, 17 Sep 2015 15:01:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcah3-0004zG-69 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:49 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 0A/8B-00536-CD5DAF55; Thu, 17 Sep 2015 15:01:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1442502106!13326424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15420 invoked from network); 17 Sep 2015 15:01:47 -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; 17 Sep 2015 15:01:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcah0-0006vn-Hd for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcagz-0006Sc-MJ for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:45 +0000 Date: Thu, 17 Sep 2015 15:01:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/hvm: fix saved pmtimer and hpet values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93a6ff88dc703fa06f50fbde9e685b43ce55da8e Author: Kouya Shimura AuthorDate: Fri Sep 11 16:27:32 2015 +0200 Commit: Jan Beulich CommitDate: Fri Sep 11 16:27:32 2015 +0200 x86/hvm: fix saved pmtimer and hpet values The ACPI PM timer is sometimes broken on live migration. Since vcpu->arch.hvm_vcpu.guest_time is always zero in other than "delay for missed ticks mode". Even in "delay for missed ticks mode", vcpu's guest_time field is not valid (i.e. zero) when the state of vcpu is "blocked". (see pt_save_timer function) The original author (Tim Deegan) of pmtimer_save() must have intended that it saves the last scheduled time of the vcpu. Unfortunately it was already implied this bug. FYI, there is no other timer mode than "delay for missed ticks mode" then. For consistency with HPET, pmtimer_save() should refer hvm_get_guest_time() to update the counter as well as hpet_save() does. Without this patch, the clock of windows server 2012R2 without HPET might leap forward several minutes on live migration. Signed-off-by: Kouya Shimura Retain use of ->arch.hvm_vcpu.guest_time when non-zero. Do the inverse adjustment for vHPET. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Kouya Shimura Release-acked-by: Wei Liu master commit: 244582a01dcb49fa30083725964a066937cc94f2 master date: 2015-09-11 16:24:56 +0200 --- xen/arch/x86/hvm/hpet.c | 4 +++- xen/arch/x86/hvm/pmtimer.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index edf9a17..facab83 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -513,11 +513,13 @@ static const struct hvm_mmio_ops hpet_mmio_ops = { static int hpet_save(struct domain *d, hvm_domain_context_t *h) { HPETState *hp = domain_vhpet(d); + struct vcpu *v = pt_global_vcpu_target(d); int rc; uint64_t guest_time; write_lock(&hp->lock); - guest_time = guest_time_hpet(hp); + guest_time = (v->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(v)) / + STIME_PER_HPET_TICK; /* Write the proper value into the main counter */ if ( hpet_enabled(hp) ) diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 07594e1..c8229e0 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -249,10 +249,12 @@ static int pmtimer_save(struct domain *d, hvm_domain_context_t *h) spin_lock(&s->lock); - /* Update the counter to the guest's current time. We always save - * with the domain paused, so the saved time should be after the - * last_gtime, but just in case, make sure we only go forwards */ - x = ((s->vcpu->arch.hvm_vcpu.guest_time - s->last_gtime) * s->scale) >> 32; + /* + * Update the counter to the guest's current time. Make sure it only + * goes forwards. + */ + x = (((s->vcpu->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(s->vcpu)) - + s->last_gtime) * s->scale) >> 32; if ( x < 1UL<<31 ) s->pm.tmr_val += x; if ( (s->pm.tmr_val & TMR_VAL_MSB) != msb ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:01:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:01: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 1Zcah3-0004zW-Q9; Thu, 17 Sep 2015 15:01:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcah3-0004zG-69 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:49 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 0A/8B-00536-CD5DAF55; Thu, 17 Sep 2015 15:01:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1442502106!13326424!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15420 invoked from network); 17 Sep 2015 15:01:47 -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; 17 Sep 2015 15:01:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcah0-0006vn-Hd for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcagz-0006Sc-MJ for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:45 +0000 Date: Thu, 17 Sep 2015 15:01:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/hvm: fix saved pmtimer and hpet values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93a6ff88dc703fa06f50fbde9e685b43ce55da8e Author: Kouya Shimura AuthorDate: Fri Sep 11 16:27:32 2015 +0200 Commit: Jan Beulich CommitDate: Fri Sep 11 16:27:32 2015 +0200 x86/hvm: fix saved pmtimer and hpet values The ACPI PM timer is sometimes broken on live migration. Since vcpu->arch.hvm_vcpu.guest_time is always zero in other than "delay for missed ticks mode". Even in "delay for missed ticks mode", vcpu's guest_time field is not valid (i.e. zero) when the state of vcpu is "blocked". (see pt_save_timer function) The original author (Tim Deegan) of pmtimer_save() must have intended that it saves the last scheduled time of the vcpu. Unfortunately it was already implied this bug. FYI, there is no other timer mode than "delay for missed ticks mode" then. For consistency with HPET, pmtimer_save() should refer hvm_get_guest_time() to update the counter as well as hpet_save() does. Without this patch, the clock of windows server 2012R2 without HPET might leap forward several minutes on live migration. Signed-off-by: Kouya Shimura Retain use of ->arch.hvm_vcpu.guest_time when non-zero. Do the inverse adjustment for vHPET. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Kouya Shimura Release-acked-by: Wei Liu master commit: 244582a01dcb49fa30083725964a066937cc94f2 master date: 2015-09-11 16:24:56 +0200 --- xen/arch/x86/hvm/hpet.c | 4 +++- xen/arch/x86/hvm/pmtimer.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index edf9a17..facab83 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -513,11 +513,13 @@ static const struct hvm_mmio_ops hpet_mmio_ops = { static int hpet_save(struct domain *d, hvm_domain_context_t *h) { HPETState *hp = domain_vhpet(d); + struct vcpu *v = pt_global_vcpu_target(d); int rc; uint64_t guest_time; write_lock(&hp->lock); - guest_time = guest_time_hpet(hp); + guest_time = (v->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(v)) / + STIME_PER_HPET_TICK; /* Write the proper value into the main counter */ if ( hpet_enabled(hp) ) diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 07594e1..c8229e0 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -249,10 +249,12 @@ static int pmtimer_save(struct domain *d, hvm_domain_context_t *h) spin_lock(&s->lock); - /* Update the counter to the guest's current time. We always save - * with the domain paused, so the saved time should be after the - * last_gtime, but just in case, make sure we only go forwards */ - x = ((s->vcpu->arch.hvm_vcpu.guest_time - s->last_gtime) * s->scale) >> 32; + /* + * Update the counter to the guest's current time. Make sure it only + * goes forwards. + */ + x = (((s->vcpu->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(s->vcpu)) - + s->last_gtime) * s->scale) >> 32; if ( x < 1UL<<31 ) s->pm.tmr_val += x; if ( (s->pm.tmr_val & TMR_VAL_MSB) != msb ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02: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 1ZcahE-00051i-T5; Thu, 17 Sep 2015 15:02:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahD-00051N-Mq for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:59 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 68/69-26043-7E5DAF55; Thu, 17 Sep 2015 15:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1442502116!18350985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9283 invoked from network); 17 Sep 2015 15:01:58 -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; 17 Sep 2015 15:01:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahA-0006vv-Mx for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcahA-0006TL-LK for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:56 +0000 Date: Thu, 17 Sep 2015 15:01:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: format fd flags with 0x since they are hex. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 607dfbb11f8117d945031a282b2b939f7eb12fb5 Author: Ian Campbell AuthorDate: Fri Sep 11 15:19:54 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 15:58:00 2015 +0100 libxl: format fd flags with 0x since they are hex. Commit 93f5194e7270 "libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards" added some logging of fcntl.F_GETFL at all as %x without a 0x prefix to make it clear they numbers are hex. Fix this alongwith an inadvertent logging of the fd itself as hex. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu (cherry picked from commit c4b717808f4bead160008ba653ed4e6b05831a71) --- tools/libxl/libxl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 6ebb96e..4d27891 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6530,7 +6530,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, goto out_err; } - LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are 0x%x", fd, fdfl); if (r_oldflags) *r_oldflags = fdfl; @@ -6538,7 +6538,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, fdfl &= mask; fdfl |= val; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { @@ -6557,11 +6557,11 @@ int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) { int ret, rc; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { - LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); rc = ERROR_FAIL; goto out_err; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02: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 1ZcahE-00051i-T5; Thu, 17 Sep 2015 15:02:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahD-00051N-Mq for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:59 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 68/69-26043-7E5DAF55; Thu, 17 Sep 2015 15:01:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1442502116!18350985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9283 invoked from network); 17 Sep 2015 15:01:58 -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; 17 Sep 2015 15:01:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahA-0006vv-Mx for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcahA-0006TL-LK for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:01:56 +0000 Date: Thu, 17 Sep 2015 15:01:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: format fd flags with 0x since they are hex. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 607dfbb11f8117d945031a282b2b939f7eb12fb5 Author: Ian Campbell AuthorDate: Fri Sep 11 15:19:54 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 15:58:00 2015 +0100 libxl: format fd flags with 0x since they are hex. Commit 93f5194e7270 "libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards" added some logging of fcntl.F_GETFL at all as %x without a 0x prefix to make it clear they numbers are hex. Fix this alongwith an inadvertent logging of the fd itself as hex. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu (cherry picked from commit c4b717808f4bead160008ba653ed4e6b05831a71) --- tools/libxl/libxl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 6ebb96e..4d27891 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6530,7 +6530,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, goto out_err; } - LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are 0x%x", fd, fdfl); if (r_oldflags) *r_oldflags = fdfl; @@ -6538,7 +6538,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, fdfl &= mask; fdfl |= val; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { @@ -6557,11 +6557,11 @@ int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) { int ret, rc; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { - LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); rc = ERROR_FAIL; goto out_err; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahN-00055Y-W3; Thu, 17 Sep 2015 15:02:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahN-00053u-Er for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:09 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 9A/9E-24856-0F5DAF55; Thu, 17 Sep 2015 15:02:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1442502127!35891051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14080 invoked from network); 17 Sep 2015 15:02:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:02:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahK-0006wV-VD for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcahK-0006UC-Qn for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:06 +0000 Date: Thu, 17 Sep 2015 15:02:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxc: introduce xc_domain_getvnuma X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13f44615d88150ff825ecd77fd27cc225db07376 Author: Wei Liu AuthorDate: Fri Sep 11 14:50:07 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:36:54 2015 +0100 libxc: introduce xc_domain_getvnuma A simple wrapper for XENMEM_get_vnumainfo. Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 818f445e71f3ec7819d2e7ed23fa3ecb2fed4054) Conflicts: tools/libxc/xc_domain.c --- tools/libxc/include/xenctrl.h | 18 +++++++++++++ tools/libxc/xc_domain.c | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 2000f12..37205c2 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1287,6 +1287,24 @@ int xc_domain_setvnuma(xc_interface *xch, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); +/* + * Retrieve vnuma configuration + * domid: IN, target domid + * nr_vnodes: IN/OUT, number of vnodes, not NULL + * nr_vmemranges: IN/OUT, number of vmemranges, not NULL + * nr_vcpus: IN/OUT, number of vcpus, not NULL + * vmemranges: OUT, an array which has length of nr_vmemranges + * vdistance: OUT, an array which has length of nr_vnodes * nr_vnodes + * vcpu_to_vnode: OUT, an array which has length of nr_vcpus + */ +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode); #if defined(__i386__) || defined(__x86_64__) /* diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 780797f..09ef748 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2493,6 +2493,60 @@ int xc_domain_setvnuma(xc_interface *xch, return rc; } +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode) +{ + int rc; + DECLARE_HYPERCALL_BOUNCE(vmemrange, sizeof(*vmemrange) * *nr_vmemranges, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vdistance, sizeof(*vdistance) * + *nr_vnodes * *nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vcpu_to_vnode, sizeof(*vcpu_to_vnode) * *nr_vcpus, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + + struct xen_vnuma_topology_info vnuma_topo; + + if ( xc_hypercall_bounce_pre(xch, vmemrange) || + xc_hypercall_bounce_pre(xch, vdistance) || + xc_hypercall_bounce_pre(xch, vcpu_to_vnode) ) + { + rc = -1; + errno = ENOMEM; + goto vnumaget_fail; + } + + set_xen_guest_handle(vnuma_topo.vmemrange.h, vmemrange); + set_xen_guest_handle(vnuma_topo.vdistance.h, vdistance); + set_xen_guest_handle(vnuma_topo.vcpu_to_vnode.h, vcpu_to_vnode); + + vnuma_topo.nr_vnodes = *nr_vnodes; + vnuma_topo.nr_vcpus = *nr_vcpus; + vnuma_topo.nr_vmemranges = *nr_vmemranges; + vnuma_topo.domid = domid; + vnuma_topo.pad = 0; + + rc = do_memory_op(xch, XENMEM_get_vnumainfo, &vnuma_topo, + sizeof(vnuma_topo)); + + *nr_vnodes = vnuma_topo.nr_vnodes; + *nr_vcpus = vnuma_topo.nr_vcpus; + *nr_vmemranges = vnuma_topo.nr_vmemranges; + + vnumaget_fail: + xc_hypercall_bounce_post(xch, vmemrange); + xc_hypercall_bounce_post(xch, vdistance); + xc_hypercall_bounce_post(xch, vcpu_to_vnode); + + return rc; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahN-00055Y-W3; Thu, 17 Sep 2015 15:02:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahN-00053u-Er for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:09 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 9A/9E-24856-0F5DAF55; Thu, 17 Sep 2015 15:02:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1442502127!35891051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14080 invoked from network); 17 Sep 2015 15:02:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:02:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahK-0006wV-VD for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcahK-0006UC-Qn for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:06 +0000 Date: Thu, 17 Sep 2015 15:02:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxc: introduce xc_domain_getvnuma X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13f44615d88150ff825ecd77fd27cc225db07376 Author: Wei Liu AuthorDate: Fri Sep 11 14:50:07 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:36:54 2015 +0100 libxc: introduce xc_domain_getvnuma A simple wrapper for XENMEM_get_vnumainfo. Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 818f445e71f3ec7819d2e7ed23fa3ecb2fed4054) Conflicts: tools/libxc/xc_domain.c --- tools/libxc/include/xenctrl.h | 18 +++++++++++++ tools/libxc/xc_domain.c | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 2000f12..37205c2 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1287,6 +1287,24 @@ int xc_domain_setvnuma(xc_interface *xch, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); +/* + * Retrieve vnuma configuration + * domid: IN, target domid + * nr_vnodes: IN/OUT, number of vnodes, not NULL + * nr_vmemranges: IN/OUT, number of vmemranges, not NULL + * nr_vcpus: IN/OUT, number of vcpus, not NULL + * vmemranges: OUT, an array which has length of nr_vmemranges + * vdistance: OUT, an array which has length of nr_vnodes * nr_vnodes + * vcpu_to_vnode: OUT, an array which has length of nr_vcpus + */ +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode); #if defined(__i386__) || defined(__x86_64__) /* diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 780797f..09ef748 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2493,6 +2493,60 @@ int xc_domain_setvnuma(xc_interface *xch, return rc; } +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode) +{ + int rc; + DECLARE_HYPERCALL_BOUNCE(vmemrange, sizeof(*vmemrange) * *nr_vmemranges, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vdistance, sizeof(*vdistance) * + *nr_vnodes * *nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vcpu_to_vnode, sizeof(*vcpu_to_vnode) * *nr_vcpus, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + + struct xen_vnuma_topology_info vnuma_topo; + + if ( xc_hypercall_bounce_pre(xch, vmemrange) || + xc_hypercall_bounce_pre(xch, vdistance) || + xc_hypercall_bounce_pre(xch, vcpu_to_vnode) ) + { + rc = -1; + errno = ENOMEM; + goto vnumaget_fail; + } + + set_xen_guest_handle(vnuma_topo.vmemrange.h, vmemrange); + set_xen_guest_handle(vnuma_topo.vdistance.h, vdistance); + set_xen_guest_handle(vnuma_topo.vcpu_to_vnode.h, vcpu_to_vnode); + + vnuma_topo.nr_vnodes = *nr_vnodes; + vnuma_topo.nr_vcpus = *nr_vcpus; + vnuma_topo.nr_vmemranges = *nr_vmemranges; + vnuma_topo.domid = domid; + vnuma_topo.pad = 0; + + rc = do_memory_op(xch, XENMEM_get_vnumainfo, &vnuma_topo, + sizeof(vnuma_topo)); + + *nr_vnodes = vnuma_topo.nr_vnodes; + *nr_vcpus = vnuma_topo.nr_vcpus; + *nr_vmemranges = vnuma_topo.nr_vmemranges; + + vnumaget_fail: + xc_hypercall_bounce_post(xch, vmemrange); + xc_hypercall_bounce_post(xch, vdistance); + xc_hypercall_bounce_post(xch, vcpu_to_vnode); + + return rc; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02: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 1ZcahZ-0005Dq-3N; Thu, 17 Sep 2015 15:02:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahX-0005DV-O4 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:19 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 77/36-05269-BF5DAF55; Thu, 17 Sep 2015 15:02:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442502137!45310834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9716 invoked from network); 17 Sep 2015 15:02:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:02:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahV-0006wZ-3r for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcahV-0006UZ-2a for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:17 +0000 Date: Thu, 17 Sep 2015 15:02:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xl/libxl: disallow saving a guest with vNUMA configured X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed9926ecf015b7693955d0d587c491d23bd0e676 Author: Wei Liu AuthorDate: Wed Sep 9 17:11:24 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:36:56 2015 +0100 xl/libxl: disallow saving a guest with vNUMA configured This is because the migration stream does not preserve node information. Note this is not a regression for migration v2 vs legacy migration because neither of them preserves node information. Signed-off-by: Wei Liu Acked-by: Ian Campbell [ ijc -- some grammar fixes to the doc and fixed a comment ] (cherry picked from commit fa6b5490be0bf2c0d1c17197e9c30af22e0a24e9) --- docs/man/xl.cfg.pod.5 | 2 ++ tools/libxl/libxl_dom.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 80e51bb..d422924 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -263,6 +263,8 @@ virtual node. Note that virtual NUMA for PV guest is not yet supported, because there is an issue with cpuid handling that affects PV virtual NUMA. +Furthermore, guests with virtual NUMA cannot be saved or migrated +because the migration stream does not preserve node information. Each B is a list, which has a form of "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]" (without quotes). diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c2518a3..b514377 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -24,6 +24,7 @@ #include #include #include +#include libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) { @@ -1602,7 +1603,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); int port; - int rc; + int rc, ret; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1612,6 +1613,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) const libxl_domain_remus_info *const r_info = dss->remus; libxl__srm_save_autogen_callbacks *const callbacks = &dss->sws.shs.callbacks.save.a; + unsigned int nr_vnodes = 0, nr_vmemranges = 0, nr_vcpus = 0; dss->rc = 0; logdirty_init(&dss->logdirty); @@ -1636,6 +1638,21 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) | (debug ? XCFLAGS_DEBUG : 0) | (dss->hvm ? XCFLAGS_HVM : 0); + /* Disallow saving a guest with vNUMA configured because migration + * stream does not preserve node information. + * + * Reject any domain which has vnuma enabled, even if the + * configuration is empty. Only domains which have no vnuma + * configuration at all are supported. + */ + ret = xc_domain_getvnuma(CTX->xch, domid, &nr_vnodes, &nr_vmemranges, + &nr_vcpus, NULL, NULL, NULL); + if (ret != -1 || errno != XEN_EOPNOTSUPP) { + LOG(ERROR, "Cannot save a guest with vNUMA configured"); + rc = ERROR_FAIL; + goto out; + } + dss->guest_evtchn.port = -1; dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02: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 1ZcahZ-0005Dq-3N; Thu, 17 Sep 2015 15:02:21 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahX-0005DV-O4 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:19 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 77/36-05269-BF5DAF55; Thu, 17 Sep 2015 15:02:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442502137!45310834!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9716 invoked from network); 17 Sep 2015 15:02:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:02:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcahV-0006wZ-3r for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZcahV-0006UZ-2a for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:17 +0000 Date: Thu, 17 Sep 2015 15:02:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xl/libxl: disallow saving a guest with vNUMA configured X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed9926ecf015b7693955d0d587c491d23bd0e676 Author: Wei Liu AuthorDate: Wed Sep 9 17:11:24 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:36:56 2015 +0100 xl/libxl: disallow saving a guest with vNUMA configured This is because the migration stream does not preserve node information. Note this is not a regression for migration v2 vs legacy migration because neither of them preserves node information. Signed-off-by: Wei Liu Acked-by: Ian Campbell [ ijc -- some grammar fixes to the doc and fixed a comment ] (cherry picked from commit fa6b5490be0bf2c0d1c17197e9c30af22e0a24e9) --- docs/man/xl.cfg.pod.5 | 2 ++ tools/libxl/libxl_dom.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 80e51bb..d422924 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -263,6 +263,8 @@ virtual node. Note that virtual NUMA for PV guest is not yet supported, because there is an issue with cpuid handling that affects PV virtual NUMA. +Furthermore, guests with virtual NUMA cannot be saved or migrated +because the migration stream does not preserve node information. Each B is a list, which has a form of "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]" (without quotes). diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c2518a3..b514377 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -24,6 +24,7 @@ #include #include #include +#include libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) { @@ -1602,7 +1603,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); int port; - int rc; + int rc, ret; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1612,6 +1613,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) const libxl_domain_remus_info *const r_info = dss->remus; libxl__srm_save_autogen_callbacks *const callbacks = &dss->sws.shs.callbacks.save.a; + unsigned int nr_vnodes = 0, nr_vmemranges = 0, nr_vcpus = 0; dss->rc = 0; logdirty_init(&dss->logdirty); @@ -1636,6 +1638,21 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) | (debug ? XCFLAGS_DEBUG : 0) | (dss->hvm ? XCFLAGS_HVM : 0); + /* Disallow saving a guest with vNUMA configured because migration + * stream does not preserve node information. + * + * Reject any domain which has vnuma enabled, even if the + * configuration is empty. Only domains which have no vnuma + * configuration at all are supported. + */ + ret = xc_domain_getvnuma(CTX->xch, domid, &nr_vnodes, &nr_vmemranges, + &nr_vcpus, NULL, NULL, NULL); + if (ret != -1 || errno != XEN_EOPNOTSUPP) { + LOG(ERROR, "Cannot save a guest with vNUMA configured"); + rc = ERROR_FAIL; + goto out; + } + dss->guest_evtchn.port = -1; dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcahj-0005QK-8X; Thu, 17 Sep 2015 15:02:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcahh-0005Lb-Nx for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:29 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 94/54-04752-506DAF55; Thu, 17 Sep 2015 15:02:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442502147!48378534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9074 invoked from network); 17 Sep 2015 15:02:28 -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; 17 Sep 2015 15:02:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcahf-0006wh-95 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcahf-0006b1-80 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:27 +0000 Date: Thu, 17 Sep 2015 15:02:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xl: handle empty vnuma configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da24ee8f47b2137bc273fa7005060d2feb00da05 Author: Wei Liu AuthorDate: Fri Sep 11 14:50:09 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:36:56 2015 +0100 xl: handle empty vnuma configuration When user specifies vnuma = [], we need to skip the whole parser function, otherwise the parser sets b_info->max_memkb to garbage value. Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit ebe3fd9e736dda6cb141abe1241f0c8491125ebc) --- tools/libxl/xl_cmdimpl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ebbb9a5..7dbf37f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1093,6 +1093,9 @@ static void parse_vnuma_config(const XLU_Config *config, if (xlu_cfg_get_list(config, "vnuma", &vnuma, &num_vnuma, 1)) return; + if (!num_vnuma) + return; + b_info->num_vnuma_nodes = num_vnuma; b_info->vnuma_nodes = xcalloc(num_vnuma, sizeof(libxl_vnode_info)); vcpu_parsed = xcalloc(num_vnuma, sizeof(libxl_bitmap)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:02:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:02:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcahj-0005QK-8X; Thu, 17 Sep 2015 15:02:31 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcahh-0005Lb-Nx for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:29 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 94/54-04752-506DAF55; Thu, 17 Sep 2015 15:02:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442502147!48378534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9074 invoked from network); 17 Sep 2015 15:02:28 -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; 17 Sep 2015 15:02:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcahf-0006wh-95 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcahf-0006b1-80 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:02:27 +0000 Date: Thu, 17 Sep 2015 15:02:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xl: handle empty vnuma configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit da24ee8f47b2137bc273fa7005060d2feb00da05 Author: Wei Liu AuthorDate: Fri Sep 11 14:50:09 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:36:56 2015 +0100 xl: handle empty vnuma configuration When user specifies vnuma = [], we need to skip the whole parser function, otherwise the parser sets b_info->max_memkb to garbage value. Signed-off-by: Wei Liu Acked-by: Ian Campbell (cherry picked from commit ebe3fd9e736dda6cb141abe1241f0c8491125ebc) --- tools/libxl/xl_cmdimpl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ebbb9a5..7dbf37f 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1093,6 +1093,9 @@ static void parse_vnuma_config(const XLU_Config *config, if (xlu_cfg_get_list(config, "vnuma", &vnuma, &num_vnuma, 1)) return; + if (!num_vnuma) + return; + b_info->num_vnuma_nodes = num_vnuma; b_info->vnuma_nodes = xcalloc(num_vnuma, sizeof(libxl_vnode_info)); vcpu_parsed = xcalloc(num_vnuma, sizeof(libxl_bitmap)); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:11:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcaq4-0006tw-AH; Thu, 17 Sep 2015 15:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcaq2-0006tl-DW for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:06 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 34/13-29649-908DAF55; Thu, 17 Sep 2015 15:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1442502663!45297827!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26910 invoked from network); 17 Sep 2015 15:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcapz-00071d-4G for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcapy-00071R-UG for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:03 +0000 Date: Thu, 17 Sep 2015 15:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] vtd/iommu: permit group devices to passthrough in relaxed 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 11d942df114045860a27563418cf5dbd5bcd0402 Author: Tiejun Chen AuthorDate: Mon Sep 14 13:42:34 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:42:34 2015 +0200 vtd/iommu: permit group devices to passthrough in relaxed mode Currently we don't allow passing through any group devices which are sharing same RMRR entry since it would break security among VMs. And indeed, we expect we can figure out a better way to handle this kind of case completely. But before the group assignment gets implemented, we might make this permission dependent on our RMRR policy. So, now it would be allowed in the relaxed mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian Release-acked-by: Wei Liu master commit: 3848058e7dd66dc35b232a029fcbde55f3eb872f master date: 2015-09-14 13:38:02 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 836aed5..7b45bff 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2297,7 +2297,9 @@ static int intel_iommu_assign_device( /* * In rare cases one given rmrr is shared by multiple devices but * obviously this would put the security of a system at risk. So - * we should prevent from this sort of device assignment. + * we would prevent from this sort of device assignment. But this + * can be permitted if user set + * "pci = [ 'sbdf, rdm_policy=relaxed' ]" * * TODO: in the future we can introduce group device assignment * interface to make sure devices sharing RMRR are assigned to the @@ -2310,12 +2312,16 @@ static int intel_iommu_assign_device( PCI_DEVFN2(bdf) == devfn && rmrr->scope.devices_cnt > 1 ) { - printk(XENLOG_G_ERR VTDPREFIX - " cannot assign %04x:%02x:%02x.%u" + bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); + + printk(XENLOG_G_WARNING VTDPREFIX + " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); - return -EPERM; + if ( !relaxed ) + return -EPERM; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:11:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcaq4-0006tw-AH; Thu, 17 Sep 2015 15:11:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcaq2-0006tl-DW for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:06 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 34/13-29649-908DAF55; Thu, 17 Sep 2015 15:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1442502663!45297827!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26910 invoked from network); 17 Sep 2015 15:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:11:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcapz-00071d-4G for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcapy-00071R-UG for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:03 +0000 Date: Thu, 17 Sep 2015 15:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] vtd/iommu: permit group devices to passthrough in relaxed 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 11d942df114045860a27563418cf5dbd5bcd0402 Author: Tiejun Chen AuthorDate: Mon Sep 14 13:42:34 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:42:34 2015 +0200 vtd/iommu: permit group devices to passthrough in relaxed mode Currently we don't allow passing through any group devices which are sharing same RMRR entry since it would break security among VMs. And indeed, we expect we can figure out a better way to handle this kind of case completely. But before the group assignment gets implemented, we might make this permission dependent on our RMRR policy. So, now it would be allowed in the relaxed mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian Release-acked-by: Wei Liu master commit: 3848058e7dd66dc35b232a029fcbde55f3eb872f master date: 2015-09-14 13:38:02 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 836aed5..7b45bff 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2297,7 +2297,9 @@ static int intel_iommu_assign_device( /* * In rare cases one given rmrr is shared by multiple devices but * obviously this would put the security of a system at risk. So - * we should prevent from this sort of device assignment. + * we would prevent from this sort of device assignment. But this + * can be permitted if user set + * "pci = [ 'sbdf, rdm_policy=relaxed' ]" * * TODO: in the future we can introduce group device assignment * interface to make sure devices sharing RMRR are assigned to the @@ -2310,12 +2312,16 @@ static int intel_iommu_assign_device( PCI_DEVFN2(bdf) == devfn && rmrr->scope.devices_cnt > 1 ) { - printk(XENLOG_G_ERR VTDPREFIX - " cannot assign %04x:%02x:%02x.%u" + bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); + + printk(XENLOG_G_WARNING VTDPREFIX + " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); - return -EPERM; + if ( !relaxed ) + return -EPERM; } } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcaqD-0006vF-Cl; Thu, 17 Sep 2015 15:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcaqB-0006v1-Hy for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:15 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 72/BB-10422-218DAF55; Thu, 17 Sep 2015 15:11:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442502673!35892489!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6051 invoked from network); 17 Sep 2015 15:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcaq9-00071l-A1 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcaq9-000729-83 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:13 +0000 Date: Thu, 17 Sep 2015 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/p2m: fix mismatched unlock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70d63e48077f8fee8eda6d8d95eeda52a34d9077 Author: Jan Beulich AuthorDate: Mon Sep 14 13:43:31 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:43:31 2015 +0200 x86/p2m: fix mismatched unlock Luckily, due to gfn_unlock() currently mapping to p2m_unlock(), this is only a cosmetic issue right now. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Release-acked-by: Wei Liu master commit: 1f180822ad3fe83fe293393ec175f14ded98f082 master date: 2015-09-14 13:39:19 +0200 --- xen/arch/x86/mm/p2m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b2726bd..6b4a35b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -912,7 +912,7 @@ static int set_typed_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, NULL, NULL); if ( p2m_is_grant(ot) || p2m_is_foreign(ot) ) { - p2m_unlock(p2m); + gfn_unlock(p2m, gfn, 0); domain_crash(d); return -ENOENT; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 17 15:11:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Sep 2015 15:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcaqD-0006vF-Cl; Thu, 17 Sep 2015 15:11:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZcaqB-0006v1-Hy for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:15 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 72/BB-10422-218DAF55; Thu, 17 Sep 2015 15:11:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442502673!35892489!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6051 invoked from network); 17 Sep 2015 15:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2015 15:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Zcaq9-00071l-A1 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Zcaq9-000729-83 for xen-changelog@lists.xensource.com; Thu, 17 Sep 2015 15:11:13 +0000 Date: Thu, 17 Sep 2015 15:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/p2m: fix mismatched unlock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 70d63e48077f8fee8eda6d8d95eeda52a34d9077 Author: Jan Beulich AuthorDate: Mon Sep 14 13:43:31 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:43:31 2015 +0200 x86/p2m: fix mismatched unlock Luckily, due to gfn_unlock() currently mapping to p2m_unlock(), this is only a cosmetic issue right now. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Release-acked-by: Wei Liu master commit: 1f180822ad3fe83fe293393ec175f14ded98f082 master date: 2015-09-14 13:39:19 +0200 --- xen/arch/x86/mm/p2m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b2726bd..6b4a35b 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -912,7 +912,7 @@ static int set_typed_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, NULL, NULL); if ( p2m_is_grant(ot) || p2m_is_foreign(ot) ) { - p2m_unlock(p2m); + gfn_unlock(p2m, gfn, 0); domain_crash(d); return -ENOENT; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 20 01:55:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Sep 2015 01: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 1ZdTqP-0001ox-0E; Sun, 20 Sep 2015 01:55:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqN-0001or-5h for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:07 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 26/BD-03819-AF11EF55; Sun, 20 Sep 2015 01:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442714105!31069061!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24928 invoked from network); 20 Sep 2015 01:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Sep 2015 01:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqK-0006AE-LY for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdTqJ-0004E1-NB for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:03 +0000 Date: Sun, 20 Sep 2015 01:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] e1000: Avoid infinite loop in processing transmit descriptor (CVE-2015-6815) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00d751038d501ab40298ebe972addfcf4ea0c54b Author: P J P AuthorDate: Fri Sep 4 17:21:06 2015 +0100 Commit: Stefano Stabellini CommitDate: Tue Sep 15 13:42:54 2015 +0000 e1000: Avoid infinite loop in processing transmit descriptor (CVE-2015-6815) While processing transmit descriptors, it could lead to an infinite loop if 'bytes' was to become zero; Add a check to avoid it. [The guest can force 'bytes' to 0 by setting the hdr_len and mss descriptor fields to 0. --Stefan] upstream-commit-id: b947ac2bf26479e710489739c465c8af336599e7 Signed-off-by: P J P Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-id: 1441383666-6590-1-git-send-email-stefanha@redhat.com Signed-off-by: Stefano Stabellini --- hw/net/e1000.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index e33a4da..3032855 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -736,7 +736,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) memmove(tp->data, tp->header, tp->hdr_len); tp->size = tp->hdr_len; } - } while (split_size -= bytes); + split_size -= bytes; + } while (bytes && split_size); } else if (!tp->tse && tp->cptse) { // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentation error\n"); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 20 01:55:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Sep 2015 01: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 1ZdTqP-0001ox-0E; Sun, 20 Sep 2015 01:55:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqN-0001or-5h for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:07 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 26/BD-03819-AF11EF55; Sun, 20 Sep 2015 01:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442714105!31069061!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24928 invoked from network); 20 Sep 2015 01:55:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 20 Sep 2015 01:55:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqK-0006AE-LY for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdTqJ-0004E1-NB for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:03 +0000 Date: Sun, 20 Sep 2015 01:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] e1000: Avoid infinite loop in processing transmit descriptor (CVE-2015-6815) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00d751038d501ab40298ebe972addfcf4ea0c54b Author: P J P AuthorDate: Fri Sep 4 17:21:06 2015 +0100 Commit: Stefano Stabellini CommitDate: Tue Sep 15 13:42:54 2015 +0000 e1000: Avoid infinite loop in processing transmit descriptor (CVE-2015-6815) While processing transmit descriptors, it could lead to an infinite loop if 'bytes' was to become zero; Add a check to avoid it. [The guest can force 'bytes' to 0 by setting the hdr_len and mss descriptor fields to 0. --Stefan] upstream-commit-id: b947ac2bf26479e710489739c465c8af336599e7 Signed-off-by: P J P Signed-off-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Message-id: 1441383666-6590-1-git-send-email-stefanha@redhat.com Signed-off-by: Stefano Stabellini --- hw/net/e1000.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index e33a4da..3032855 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -736,7 +736,8 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp) memmove(tp->data, tp->header, tp->hdr_len); tp->size = tp->hdr_len; } - } while (split_size -= bytes); + split_size -= bytes; + } while (bytes && split_size); } else if (!tp->tse && tp->cptse) { // context descriptor TSE is not set, while data descriptor TSE is set DBGOUT(TXERR, "TCP segmentation error\n"); -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 20 01:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Sep 2015 01:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqZ-0001pm-36; Sun, 20 Sep 2015 01:55:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqY-0001pd-3o for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:18 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id D7/57-32641-5021EF55; Sun, 20 Sep 2015 01:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442714115!45730594!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29094 invoked from network); 20 Sep 2015 01:55: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; 20 Sep 2015 01:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqU-0006AI-Rz for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdTqU-0004Ec-QT for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:14 +0000 Date: Sun, 20 Sep 2015 01:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] net: add checks to validate ring buffer pointers(CVE-2015-5279) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25d01b6912a6ed09fc0479791f2920e196dc1ab7 Author: P J P AuthorDate: Tue Sep 15 16:40:49 2015 +0530 Commit: Stefano Stabellini CommitDate: Tue Sep 15 13:43:24 2015 +0000 net: add checks to validate ring buffer pointers(CVE-2015-5279) Ne2000 NIC uses ring buffer of NE2000_MEM_SIZE(49152) bytes to process network packets. While receiving packets via ne2000_receive() routine, a local 'index' variable could exceed the ring buffer size, which could lead to a memory buffer overflow. Added other checks at initialisation. upstream-commit-id: 9bbdbc66e5765068dce76e9269dce4547afd8ad4 Reported-by: Qinghao Tang Signed-off-by: P J P Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/ne2000.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 3ab2d03..109ef4e 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -230,6 +230,9 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) } index = s->curpag << 8; + if (index >= NE2000_PMEM_END) { + index = s->start; + } /* 4 bytes for header */ total_len = size + 4; /* address for next packet (4 bytes for CRC) */ @@ -315,13 +318,19 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) offset = addr | (page << 4); switch(offset) { case EN0_STARTPG: - s->start = val << 8; + if (val << 8 <= NE2000_PMEM_END) { + s->start = val << 8; + } break; case EN0_STOPPG: - s->stop = val << 8; + if (val << 8 <= NE2000_PMEM_END) { + s->stop = val << 8; + } break; case EN0_BOUNDARY: - s->boundary = val; + if (val << 8 < NE2000_PMEM_END) { + s->boundary = val; + } break; case EN0_IMR: s->imr = val; @@ -362,7 +371,9 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) s->phys[offset - EN1_PHYS] = val; break; case EN1_CURPAG: - s->curpag = val; + if (val << 8 < NE2000_PMEM_END) { + s->curpag = val; + } break; case EN1_MULT ... EN1_MULT + 7: s->mult[offset - EN1_MULT] = val; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 20 01:55:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Sep 2015 01:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqZ-0001pm-36; Sun, 20 Sep 2015 01:55:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqY-0001pd-3o for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:18 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id D7/57-32641-5021EF55; Sun, 20 Sep 2015 01:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442714115!45730594!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29094 invoked from network); 20 Sep 2015 01:55: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; 20 Sep 2015 01:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqU-0006AI-Rz for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdTqU-0004Ec-QT for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:14 +0000 Date: Sun, 20 Sep 2015 01:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] net: add checks to validate ring buffer pointers(CVE-2015-5279) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 25d01b6912a6ed09fc0479791f2920e196dc1ab7 Author: P J P AuthorDate: Tue Sep 15 16:40:49 2015 +0530 Commit: Stefano Stabellini CommitDate: Tue Sep 15 13:43:24 2015 +0000 net: add checks to validate ring buffer pointers(CVE-2015-5279) Ne2000 NIC uses ring buffer of NE2000_MEM_SIZE(49152) bytes to process network packets. While receiving packets via ne2000_receive() routine, a local 'index' variable could exceed the ring buffer size, which could lead to a memory buffer overflow. Added other checks at initialisation. upstream-commit-id: 9bbdbc66e5765068dce76e9269dce4547afd8ad4 Reported-by: Qinghao Tang Signed-off-by: P J P Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/ne2000.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 3ab2d03..109ef4e 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -230,6 +230,9 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) } index = s->curpag << 8; + if (index >= NE2000_PMEM_END) { + index = s->start; + } /* 4 bytes for header */ total_len = size + 4; /* address for next packet (4 bytes for CRC) */ @@ -315,13 +318,19 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) offset = addr | (page << 4); switch(offset) { case EN0_STARTPG: - s->start = val << 8; + if (val << 8 <= NE2000_PMEM_END) { + s->start = val << 8; + } break; case EN0_STOPPG: - s->stop = val << 8; + if (val << 8 <= NE2000_PMEM_END) { + s->stop = val << 8; + } break; case EN0_BOUNDARY: - s->boundary = val; + if (val << 8 < NE2000_PMEM_END) { + s->boundary = val; + } break; case EN0_IMR: s->imr = val; @@ -362,7 +371,9 @@ static void ne2000_ioport_write(void *opaque, uint32_t addr, uint32_t val) s->phys[offset - EN1_PHYS] = val; break; case EN1_CURPAG: - s->curpag = val; + if (val << 8 < NE2000_PMEM_END) { + s->curpag = val; + } break; case EN1_MULT ... EN1_MULT + 7: s->mult[offset - EN1_MULT] = val; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 20 01:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Sep 2015 01: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 1ZdTqj-0001qk-5m; Sun, 20 Sep 2015 01:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqh-0001qZ-DL for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:27 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 81/E1-01753-E021EF55; Sun, 20 Sep 2015 01:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442714125!44609117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23960 invoked from network); 20 Sep 2015 01:55:26 -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; 20 Sep 2015 01:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqf-0006Ao-0E for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdTqe-0004FB-Uu for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:24 +0000 Date: Sun, 20 Sep 2015 01:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] net: avoid infinite loop when receiving packets(CVE-2015-5278) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ad9e71fc937439730fa68e82d6da11a50eb5c04 Author: P J P AuthorDate: Tue Sep 15 16:46:59 2015 +0530 Commit: Stefano Stabellini CommitDate: Tue Sep 15 13:43:47 2015 +0000 net: avoid infinite loop when receiving packets(CVE-2015-5278) Ne2000 NIC uses ring buffer of NE2000_MEM_SIZE(49152) bytes to process network packets. While receiving packets via ne2000_receive() routine, a local 'index' variable could exceed the ring buffer size, leading to an infinite loop situation. upstream-commit-id: 737d2b3c41d59eb8f94ab7eb419b957938f24943 Reported-by: Qinghao Tang Signed-off-by: P J P Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/ne2000.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 109ef4e..63f1960 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -256,7 +256,7 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) if (index <= s->stop) avail = s->stop - index; else - avail = 0; + break; len = size; if (len > avail) len = avail; -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 20 01:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 20 Sep 2015 01: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 1ZdTqj-0001qk-5m; Sun, 20 Sep 2015 01:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqh-0001qZ-DL for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:27 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 81/E1-01753-E021EF55; Sun, 20 Sep 2015 01:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442714125!44609117!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23960 invoked from network); 20 Sep 2015 01:55:26 -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; 20 Sep 2015 01:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdTqf-0006Ao-0E for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdTqe-0004FB-Uu for xen-changelog@lists.xensource.com; Sun, 20 Sep 2015 01:55:24 +0000 Date: Sun, 20 Sep 2015 01:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] net: avoid infinite loop when receiving packets(CVE-2015-5278) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8ad9e71fc937439730fa68e82d6da11a50eb5c04 Author: P J P AuthorDate: Tue Sep 15 16:46:59 2015 +0530 Commit: Stefano Stabellini CommitDate: Tue Sep 15 13:43:47 2015 +0000 net: avoid infinite loop when receiving packets(CVE-2015-5278) Ne2000 NIC uses ring buffer of NE2000_MEM_SIZE(49152) bytes to process network packets. While receiving packets via ne2000_receive() routine, a local 'index' variable could exceed the ring buffer size, leading to an infinite loop situation. upstream-commit-id: 737d2b3c41d59eb8f94ab7eb419b957938f24943 Reported-by: Qinghao Tang Signed-off-by: P J P Signed-off-by: Stefan Hajnoczi Signed-off-by: Stefano Stabellini --- hw/net/ne2000.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/net/ne2000.c b/hw/net/ne2000.c index 109ef4e..63f1960 100644 --- a/hw/net/ne2000.c +++ b/hw/net/ne2000.c @@ -256,7 +256,7 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) if (index <= s->stop) avail = s->stop - index; else - avail = 0; + break; len = size; if (len > avail) len = avail; -- 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 Mon Sep 21 01:11:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 21 Sep 2015 01:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdpdK-0001UY-22; Mon, 21 Sep 2015 01:11:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdpdJ-0001US-4Z for xen-changelog@lists.xensource.com; Mon, 21 Sep 2015 01:11:05 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id BF/56-19125-8295FF55; Mon, 21 Sep 2015 01:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1442797862!36474597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 464 invoked from network); 21 Sep 2015 01:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2015 01:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdpdG-0003UG-OL for xen-changelog@lists.xensource.com; Mon, 21 Sep 2015 01:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdpdG-0004uh-Hi for xen-changelog@lists.xensource.com; Mon, 21 Sep 2015 01:11:02 +0000 Date: Mon, 21 Sep 2015 01:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: Increase device model startup timeout to 1min. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba7d8144fd004cc1431d53b3a95d1755158f2444 Author: Anthony PERARD AuthorDate: Tue Jul 7 16:09:13 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 18 16:30:10 2015 +0100 libxl: Increase device model startup timeout to 1min. On a busy host, QEMU may take more than 10s to load and start. This is likely due to a bug in Linux where the I/O subsystem sometime produce high latency under load and result in QEMU taking a long time to load every single dynamic libraries. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson (cherry picked from commit 9acfbe14d7261b03e3b3f4dc3c850ba2a7093e1f) Conflicts: tools/libxl/libxl_internal.h (cherry picked from commit bbbd29a25d090f1180d14210358c6d7ccdebef85) (cherry picked from commit fe66a76a2d6e30f2cd3aea6b2c8cb41f20ca6ea2) (cherry picked from commit 6d81366482a2fbc418cc96bd2d9875ae99da612c) --- tools/libxl/libxl_internal.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 636c91b..5a0d681 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -83,7 +83,9 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_HOTPLUG_TIMEOUT 10 -#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +/* QEMU may be slow to load and start due to a bug in Linux where the I/O + * subsystem sometime produce high latency under load. */ +#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 21 01:11:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 21 Sep 2015 01:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdpdK-0001UY-22; Mon, 21 Sep 2015 01:11:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdpdJ-0001US-4Z for xen-changelog@lists.xensource.com; Mon, 21 Sep 2015 01:11:05 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id BF/56-19125-8295FF55; Mon, 21 Sep 2015 01:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1442797862!36474597!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 464 invoked from network); 21 Sep 2015 01:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Sep 2015 01:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZdpdG-0003UG-OL for xen-changelog@lists.xensource.com; Mon, 21 Sep 2015 01:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZdpdG-0004uh-Hi for xen-changelog@lists.xensource.com; Mon, 21 Sep 2015 01:11:02 +0000 Date: Mon, 21 Sep 2015 01:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: Increase device model startup timeout to 1min. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ba7d8144fd004cc1431d53b3a95d1755158f2444 Author: Anthony PERARD AuthorDate: Tue Jul 7 16:09:13 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 18 16:30:10 2015 +0100 libxl: Increase device model startup timeout to 1min. On a busy host, QEMU may take more than 10s to load and start. This is likely due to a bug in Linux where the I/O subsystem sometime produce high latency under load and result in QEMU taking a long time to load every single dynamic libraries. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson (cherry picked from commit 9acfbe14d7261b03e3b3f4dc3c850ba2a7093e1f) Conflicts: tools/libxl/libxl_internal.h (cherry picked from commit bbbd29a25d090f1180d14210358c6d7ccdebef85) (cherry picked from commit fe66a76a2d6e30f2cd3aea6b2c8cb41f20ca6ea2) (cherry picked from commit 6d81366482a2fbc418cc96bd2d9875ae99da612c) --- tools/libxl/libxl_internal.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 636c91b..5a0d681 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -83,7 +83,9 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_HOTPLUG_TIMEOUT 10 -#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +/* QEMU may be slow to load and start due to a bug in Linux where the I/O + * subsystem sometime produce high latency under load. */ +#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsm-0001FP-UF; Tue, 22 Sep 2015 10:33:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsl-0001FJ-Uf for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:08 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id E2/66-02380-36E21065; Tue, 22 Sep 2015 10:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442917985!31580503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13349 invoked from network); 22 Sep 2015 10:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsj-0007Zu-9N for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKsi-0002nm-A1 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:04 +0000 Date: Tue, 22 Sep 2015 10:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: stable backports should be requested on xen-devel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 664675adece8e6c4220c3bd22b1f78bea7e630b1 Author: Ian Campbell AuthorDate: Sat Jul 25 08:28:58 2015 +0000 Commit: Ian Jackson CommitDate: Wed Sep 9 13:12:32 2015 +0100 MAINTAINERS: stable backports should be requested on xen-devel As well as CC-ing the correct people. I just saw such a request on xen-users and thought this was worth clarifying here too. Signed-off-by: Ian Campbell --- MAINTAINERS | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a7fad84..a6bece6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,10 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Backport requests should be made on the xen-devel@lists.xenproject.org +list. Remember to copy the appropriate stable branch maintainer who +will be listed in this section of the MAINTAINERS file in the +appropriate branch. Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsm-0001FP-UF; Tue, 22 Sep 2015 10:33:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsl-0001FJ-Uf for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:08 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id E2/66-02380-36E21065; Tue, 22 Sep 2015 10:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442917985!31580503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13349 invoked from network); 22 Sep 2015 10:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsj-0007Zu-9N for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKsi-0002nm-A1 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:04 +0000 Date: Tue, 22 Sep 2015 10:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: stable backports should be requested on xen-devel X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 664675adece8e6c4220c3bd22b1f78bea7e630b1 Author: Ian Campbell AuthorDate: Sat Jul 25 08:28:58 2015 +0000 Commit: Ian Jackson CommitDate: Wed Sep 9 13:12:32 2015 +0100 MAINTAINERS: stable backports should be requested on xen-devel As well as CC-ing the correct people. I just saw such a request on xen-users and thought this was worth clarifying here too. Signed-off-by: Ian Campbell --- MAINTAINERS | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a7fad84..a6bece6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -49,9 +49,10 @@ for inclusion in xen-unstable. Please see http://wiki.xen.org/wiki/Xen_Maintenance_Releases for more information. -Remember to copy the appropriate stable branch maintainer who will be -listed in this section of the MAINTAINERS file in the appropriate -branch. +Backport requests should be made on the xen-devel@lists.xenproject.org +list. Remember to copy the appropriate stable branch maintainer who +will be listed in this section of the MAINTAINERS file in the +appropriate branch. Unstable Subsystem Maintainers ============================== -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsz-0001Gb-0m; Tue, 22 Sep 2015 10:33:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsx-0001GK-53 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:19 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id CE/DC-32615-E6E21065; Tue, 22 Sep 2015 10:33:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1442917996!12510658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32499 invoked from network); 22 Sep 2015 10:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsu-0007Zy-MU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKst-0002oG-QM for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:15 +0000 Date: Tue, 22 Sep 2015 10:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Branch for 4.6: Unpin QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf6cfbb187f8d1078af655e754eb8a2ffd4ae865 Author: Ian Jackson AuthorDate: Wed Sep 9 13:18:13 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:18:13 2015 +0100 Branch for 4.6: Unpin QEMU_UPSTREAM_REVISION --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 59607b4..68adb88 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc3 +QEMU_UPSTREAM_REVISION ?= master MINIOS_UPSTREAM_REVISION ?= b36bcb370d611ad7f41e8c21d061e6291e088c58 # Fri Jun 26 11:58:40 2015 +0100 # Correct printf formatting for tpm_tis message. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsz-0001Gb-0m; Tue, 22 Sep 2015 10:33:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsx-0001GK-53 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:19 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id CE/DC-32615-E6E21065; Tue, 22 Sep 2015 10:33:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1442917996!12510658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32499 invoked from network); 22 Sep 2015 10:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKsu-0007Zy-MU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKst-0002oG-QM for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:15 +0000 Date: Tue, 22 Sep 2015 10:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Branch for 4.6: Unpin QEMU_UPSTREAM_REVISION X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf6cfbb187f8d1078af655e754eb8a2ffd4ae865 Author: Ian Jackson AuthorDate: Wed Sep 9 13:18:13 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:18:13 2015 +0100 Branch for 4.6: Unpin QEMU_UPSTREAM_REVISION --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 59607b4..68adb88 100644 --- a/Config.mk +++ b/Config.mk @@ -254,7 +254,7 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.0-rc3 +QEMU_UPSTREAM_REVISION ?= master MINIOS_UPSTREAM_REVISION ?= b36bcb370d611ad7f41e8c21d061e6291e088c58 # Fri Jun 26 11:58:40 2015 +0100 # Correct printf formatting for tpm_tis message. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKt9-0001I0-3J; Tue, 22 Sep 2015 10:33:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKt7-0001Hk-9n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:29 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 69/56-24856-87E21065; Tue, 22 Sep 2015 10:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442918007!31580626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17034 invoked from network); 22 Sep 2015 10:33:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKt5-0007a6-1d for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKt4-0002oo-QE for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:27 +0000 Date: Tue, 22 Sep 2015 10:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Branch for 4.6: Update staging version to 4.7-unstable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 315a8722b4d7ba6141c6cc85009b6e09f5b20424 Author: Ian Jackson AuthorDate: Wed Sep 9 13:19:57 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:19:59 2015 +0100 Branch for 4.6: Update staging version to 4.7-unstable * Change README to say `Xen 4.6-rc' * Change XEN_EXTRAVERSION so that we are `4.6.0-rc' Signed-off-by: Ian Jackson --- README | 10 +++++----- xen/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 522f1a2..a7d0033 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ __ -\ \/ /___ _ __ | || | / /_ _ __ ___ - \ // _ \ '_ \ | || |_| '_ \ _____| '__/ __| - / \ __/ | | | |__ _| (_) |_____| | | (__ -/_/\_\___|_| |_| |_|(_)___/ |_| \___| +__ __ _ _ _____ _ _ _ +\ \/ /___ _ __ | || | |___ | _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_ / /____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _| / /_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_)_/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| ################################# diff --git a/xen/Makefile b/xen/Makefile index 6088c9d..c556198 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,8 +1,8 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 -export XEN_SUBVERSION = 6 -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) +export XEN_SUBVERSION = 7 +export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKt9-0001I0-3J; Tue, 22 Sep 2015 10:33:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKt7-0001Hk-9n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:29 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 69/56-24856-87E21065; Tue, 22 Sep 2015 10:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442918007!31580626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17034 invoked from network); 22 Sep 2015 10:33:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKt5-0007a6-1d for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKt4-0002oo-QE for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:27 +0000 Date: Tue, 22 Sep 2015 10:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Branch for 4.6: Update staging version to 4.7-unstable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 315a8722b4d7ba6141c6cc85009b6e09f5b20424 Author: Ian Jackson AuthorDate: Wed Sep 9 13:19:57 2015 +0100 Commit: Ian Jackson CommitDate: Wed Sep 9 13:19:59 2015 +0100 Branch for 4.6: Update staging version to 4.7-unstable * Change README to say `Xen 4.6-rc' * Change XEN_EXTRAVERSION so that we are `4.6.0-rc' Signed-off-by: Ian Jackson --- README | 10 +++++----- xen/Makefile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README b/README index 522f1a2..a7d0033 100644 --- a/README +++ b/README @@ -1,9 +1,9 @@ ################################# -__ __ _ _ __ -\ \/ /___ _ __ | || | / /_ _ __ ___ - \ // _ \ '_ \ | || |_| '_ \ _____| '__/ __| - / \ __/ | | | |__ _| (_) |_____| | | (__ -/_/\_\___|_| |_| |_|(_)___/ |_| \___| +__ __ _ _ _____ _ _ _ +\ \/ /___ _ __ | || | |___ | _ _ _ __ ___| |_ __ _| |__ | | ___ + \ // _ \ '_ \ | || |_ / /____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \ + / \ __/ | | | |__ _| / /_____| |_| | | | \__ \ || (_| | |_) | | __/ +/_/\_\___|_| |_| |_|(_)_/ \__,_|_| |_|___/\__\__,_|_.__/|_|\___| ################################# diff --git a/xen/Makefile b/xen/Makefile index 6088c9d..c556198 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -1,8 +1,8 @@ # This is the correct place to edit the build version. # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 -export XEN_SUBVERSION = 6 -export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION) +export XEN_SUBVERSION = 7 +export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtI-0001KK-Hl; Tue, 22 Sep 2015 10:33:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtH-0001K5-PL for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:39 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id F3/DD-23203-38E21065; Tue, 22 Sep 2015 10:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442918017!11865998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19946 invoked from network); 22 Sep 2015 10:33:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtF-0007aL-81 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtF-0002qJ-6G for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:37 +0000 Date: Tue, 22 Sep 2015 10:33:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] efi: introduce efi_arch_flush_dcache_area X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d6a3c755374f04f6dd25373da28291a8f35bede Author: Stefano Stabellini AuthorDate: Wed Sep 9 15:29:06 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 15:29:06 2015 +0200 efi: introduce efi_arch_flush_dcache_area Objects loaded by FileHandle->Read need to be flushed from dcache, otherwise copy_from_paddr will read stale data when copying the kernel, causing a failure to boot. Introduce efi_arch_flush_dcache_area and call it from read_file. This commit introduces no functional changes on x86. Reported-by: Mark Rutland Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Release-acked-by: Wei Liu --- xen/arch/arm/efi/efi-boot.h | 7 +++++++ xen/arch/x86/efi/efi-boot.h | 2 ++ xen/common/efi/boot.c | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 6a12d91..e427e5f 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -9,6 +9,7 @@ #include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); +void __flush_dcache_area(const void *vaddr, unsigned long size); #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -571,6 +572,12 @@ static void __init efi_arch_video_init(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop, EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info) { } + +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) +{ + __flush_dcache_area(vaddr, size); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 2dd69f6..4c7f383 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -640,6 +640,8 @@ static bool_t __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) return 1; /* x86 always uses a config file */ } +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { } + /* * Local variables: * mode: C diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 75a939f..2bc5b25 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -528,6 +528,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, PrintErrMesg(name, ret); } + efi_arch_flush_dcache_area(file->ptr, file->size); + 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 Tue Sep 22 10:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtI-0001KK-Hl; Tue, 22 Sep 2015 10:33:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtH-0001K5-PL for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:39 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id F3/DD-23203-38E21065; Tue, 22 Sep 2015 10:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442918017!11865998!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19946 invoked from network); 22 Sep 2015 10:33:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtF-0007aL-81 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtF-0002qJ-6G for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:37 +0000 Date: Tue, 22 Sep 2015 10:33:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] efi: introduce efi_arch_flush_dcache_area X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d6a3c755374f04f6dd25373da28291a8f35bede Author: Stefano Stabellini AuthorDate: Wed Sep 9 15:29:06 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 15:29:06 2015 +0200 efi: introduce efi_arch_flush_dcache_area Objects loaded by FileHandle->Read need to be flushed from dcache, otherwise copy_from_paddr will read stale data when copying the kernel, causing a failure to boot. Introduce efi_arch_flush_dcache_area and call it from read_file. This commit introduces no functional changes on x86. Reported-by: Mark Rutland Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Release-acked-by: Wei Liu --- xen/arch/arm/efi/efi-boot.h | 7 +++++++ xen/arch/x86/efi/efi-boot.h | 2 ++ xen/common/efi/boot.c | 2 ++ 3 files changed, 11 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h index 6a12d91..e427e5f 100644 --- a/xen/arch/arm/efi/efi-boot.h +++ b/xen/arch/arm/efi/efi-boot.h @@ -9,6 +9,7 @@ #include void noreturn efi_xen_start(void *fdt_ptr, uint32_t fdt_size); +void __flush_dcache_area(const void *vaddr, unsigned long size); #define DEVICE_TREE_GUID \ {0xb1b621d5, 0xf19c, 0x41a5, {0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0}} @@ -571,6 +572,12 @@ static void __init efi_arch_video_init(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop, EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info) { } + +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) +{ + __flush_dcache_area(vaddr, size); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 2dd69f6..4c7f383 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -640,6 +640,8 @@ static bool_t __init efi_arch_use_config_file(EFI_SYSTEM_TABLE *SystemTable) return 1; /* x86 always uses a config file */ } +static void efi_arch_flush_dcache_area(const void *vaddr, UINTN size) { } + /* * Local variables: * mode: C diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 75a939f..2bc5b25 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -528,6 +528,8 @@ static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, CHAR16 *name, PrintErrMesg(name, ret); } + efi_arch_flush_dcache_area(file->ptr, file->size); + 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 Tue Sep 22 10:33:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33: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 1ZeKtS-0001Mx-KG; Tue, 22 Sep 2015 10:33:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtR-0001Md-VG for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:50 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 7D/A1-06021-D8E21065; Tue, 22 Sep 2015 10:33:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1442918027!46485521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32537 invoked from network); 22 Sep 2015 10:33:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtP-0007aT-Df for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtP-0002qf-By for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:47 +0000 Date: Tue, 22 Sep 2015 10:33:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: Set VPMU context pointer to NULL when freeing it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b5fd6433f54281f3bffd79f2d759dd0edc1f3ab Author: Boris Ostrovsky AuthorDate: Wed Sep 9 15:32:00 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 15:32:00 2015 +0200 x86/VPMU: Set VPMU context pointer to NULL when freeing it Otherwise we may hit assertion in vpmu_initialise() if vcpu is offlined and then onlined again. For tidyness, set priv_context to NULL as well. Signed-off-by: Boris Ostrovsky Reviewed-by: Dietmar Hahn Release-acked-by: Wei Liu --- xen/arch/x86/cpu/vpmu_amd.c | 2 ++ xen/arch/x86/cpu/vpmu_intel.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 825be72..04da81a 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -438,6 +438,8 @@ static void amd_vpmu_destroy(struct vcpu *v) amd_vpmu_unset_msr_bitmap(v); xfree(vpmu->context); + vpmu->context = NULL; + vpmu->priv_context = NULL; if ( vpmu_is_set(vpmu, VPMU_RUNNING) ) release_pmu_ownship(PMU_OWNER_HVM); diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index b3750d7..12f80ae 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -828,7 +828,9 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); xfree(vpmu->context); + vpmu->context = NULL; xfree(vpmu->priv_context); + vpmu->priv_context = NULL; if ( has_hvm_container_vcpu(v) && cpu_has_vmx_msr_bitmap ) core2_vpmu_unset_msr_bitmap(v->arch.hvm_vmx.msr_bitmap); release_pmu_ownship(PMU_OWNER_HVM); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:33:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:33: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 1ZeKtS-0001Mx-KG; Tue, 22 Sep 2015 10:33:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtR-0001Md-VG for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:50 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 7D/A1-06021-D8E21065; Tue, 22 Sep 2015 10:33:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1442918027!46485521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32537 invoked from network); 22 Sep 2015 10:33:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtP-0007aT-Df for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtP-0002qf-By for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:47 +0000 Date: Tue, 22 Sep 2015 10:33:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: Set VPMU context pointer to NULL when freeing it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b5fd6433f54281f3bffd79f2d759dd0edc1f3ab Author: Boris Ostrovsky AuthorDate: Wed Sep 9 15:32:00 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 15:32:00 2015 +0200 x86/VPMU: Set VPMU context pointer to NULL when freeing it Otherwise we may hit assertion in vpmu_initialise() if vcpu is offlined and then onlined again. For tidyness, set priv_context to NULL as well. Signed-off-by: Boris Ostrovsky Reviewed-by: Dietmar Hahn Release-acked-by: Wei Liu --- xen/arch/x86/cpu/vpmu_amd.c | 2 ++ xen/arch/x86/cpu/vpmu_intel.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 825be72..04da81a 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -438,6 +438,8 @@ static void amd_vpmu_destroy(struct vcpu *v) amd_vpmu_unset_msr_bitmap(v); xfree(vpmu->context); + vpmu->context = NULL; + vpmu->priv_context = NULL; if ( vpmu_is_set(vpmu, VPMU_RUNNING) ) release_pmu_ownship(PMU_OWNER_HVM); diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index b3750d7..12f80ae 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -828,7 +828,9 @@ static void core2_vpmu_destroy(struct vcpu *v) struct vpmu_struct *vpmu = vcpu_vpmu(v); xfree(vpmu->context); + vpmu->context = NULL; xfree(vpmu->priv_context); + vpmu->priv_context = NULL; if ( has_hvm_container_vcpu(v) && cpu_has_vmx_msr_bitmap ) core2_vpmu_unset_msr_bitmap(v->arch.hvm_vmx.msr_bitmap); release_pmu_ownship(PMU_OWNER_HVM); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtd-0001PQ-Nm; Tue, 22 Sep 2015 10:34:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtd-0001P8-1V for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:01 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id DB/81-16618-89E21065; Tue, 22 Sep 2015 10:34:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1442918038!25339634!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16353 invoked from network); 22 Sep 2015 10:33:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKta-0007ab-C8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtZ-0002r2-H3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:57 +0000 Date: Tue, 22 Sep 2015 10:33:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ACPI/table: Always count matched and successfully parsed entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cf5efd610fe58160ceba3b5daece79c6a245c8fc Author: Tomasz Nowicki AuthorDate: Wed Sep 9 16:25:42 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:25:42 2015 +0200 ACPI/table: Always count matched and successfully parsed entries acpi_parse_entries() allows to traverse all available table entries (aka subtables) by passing max_entries parameter equal to 0, but since its count variable is only incremented if max_entries is not 0, the function always returns 0 for max_entries equal to 0. It would be more useful if it returned the number of entries matched instead, so make it increment count in that case too. Signed-off-by: Tomasz Nowicki [Linux commit 4ceacd02f5a1795c5c697e0345ee10beef675290] Signed-off-by: Shannon Zhao --- xen/drivers/acpi/tables.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index e57cf2a..1da2127 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -239,10 +239,13 @@ acpi_table_parse_entries(char *id, } if (entry->type == entry_id - && (!max_entries || count++ < max_entries)) + && (!max_entries || count < max_entries)) { if (handler(entry, table_end)) return -EINVAL; + count++; + } + entry = (struct acpi_subtable_header *) ((unsigned long)entry + entry->length); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtd-0001PQ-Nm; Tue, 22 Sep 2015 10:34:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtd-0001P8-1V for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:01 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id DB/81-16618-89E21065; Tue, 22 Sep 2015 10:34:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1442918038!25339634!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16353 invoked from network); 22 Sep 2015 10:33:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:33:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKta-0007ab-C8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtZ-0002r2-H3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:33:57 +0000 Date: Tue, 22 Sep 2015 10:33:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ACPI/table: Always count matched and successfully parsed entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cf5efd610fe58160ceba3b5daece79c6a245c8fc Author: Tomasz Nowicki AuthorDate: Wed Sep 9 16:25:42 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:25:42 2015 +0200 ACPI/table: Always count matched and successfully parsed entries acpi_parse_entries() allows to traverse all available table entries (aka subtables) by passing max_entries parameter equal to 0, but since its count variable is only incremented if max_entries is not 0, the function always returns 0 for max_entries equal to 0. It would be more useful if it returned the number of entries matched instead, so make it increment count in that case too. Signed-off-by: Tomasz Nowicki [Linux commit 4ceacd02f5a1795c5c697e0345ee10beef675290] Signed-off-by: Shannon Zhao --- xen/drivers/acpi/tables.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index e57cf2a..1da2127 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -239,10 +239,13 @@ acpi_table_parse_entries(char *id, } if (entry->type == entry_id - && (!max_entries || count++ < max_entries)) + && (!max_entries || count < max_entries)) { if (handler(entry, table_end)) return -EINVAL; + count++; + } + entry = (struct acpi_subtable_header *) ((unsigned long)entry + entry->length); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34: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 1ZeKtn-0001Rd-QT; Tue, 22 Sep 2015 10:34:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtm-0001RL-R0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:10 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 06/1B-10422-2AE21065; Tue, 22 Sep 2015 10:34:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442918048!36849490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8585 invoked from network); 22 Sep 2015 10:34:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtk-0007bC-Hm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtk-0002ra-Ft for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:08 +0000 Date: Tue, 22 Sep 2015 10:34:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ACPI: disable ACPI cleanly when bad RSDP found X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f09ae7bcbef680c9a6edb816557d1af4179b591 Author: Len Brown AuthorDate: Wed Sep 9 16:26:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:26:12 2015 +0200 ACPI: disable ACPI cleanly when bad RSDP found When ACPI is disabled in the BIOS of this VIA C3 box, it invalidates the RSDP, which Linux notices: ACPI Error (tbxfroot-0218): A valid RSDP was not found [20080926] Bug Linux neglected to disable ACPI at that stage, and later scribbled on smp_found_config: ACPI: No APIC-table, disabling MPS But this box doesn't run well in legacy PIC mode, it needed IOAPIC mode to perform correctly: http://lkml.org/lkml/2009/2/5/39 So exit ACPI mode cleanly when we first detect that it is hopeless. Signed-off-by: Len Brown [Linux commit 9e3a9d1ed8cc8db93e5c53e9a5b09065bd95de8b] Signed-off-by: Shannon Zhao --- xen/drivers/acpi/tables.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 1da2127..6085fda 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -329,7 +329,12 @@ static void __init check_multiple_madt(void) int __init acpi_table_init(void) { - acpi_initialize_tables(NULL, ACPI_MAX_TABLES, 0); + acpi_status status; + + status = acpi_initialize_tables(NULL, ACPI_MAX_TABLES, 0); + if (ACPI_FAILURE(status)) + return 1; + check_multiple_madt(); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34: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 1ZeKtn-0001Rd-QT; Tue, 22 Sep 2015 10:34:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtm-0001RL-R0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:10 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 06/1B-10422-2AE21065; Tue, 22 Sep 2015 10:34:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442918048!36849490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8585 invoked from network); 22 Sep 2015 10:34:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtk-0007bC-Hm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtk-0002ra-Ft for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:08 +0000 Date: Tue, 22 Sep 2015 10:34:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ACPI: disable ACPI cleanly when bad RSDP found X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0f09ae7bcbef680c9a6edb816557d1af4179b591 Author: Len Brown AuthorDate: Wed Sep 9 16:26:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:26:12 2015 +0200 ACPI: disable ACPI cleanly when bad RSDP found When ACPI is disabled in the BIOS of this VIA C3 box, it invalidates the RSDP, which Linux notices: ACPI Error (tbxfroot-0218): A valid RSDP was not found [20080926] Bug Linux neglected to disable ACPI at that stage, and later scribbled on smp_found_config: ACPI: No APIC-table, disabling MPS But this box doesn't run well in legacy PIC mode, it needed IOAPIC mode to perform correctly: http://lkml.org/lkml/2009/2/5/39 So exit ACPI mode cleanly when we first detect that it is hopeless. Signed-off-by: Len Brown [Linux commit 9e3a9d1ed8cc8db93e5c53e9a5b09065bd95de8b] Signed-off-by: Shannon Zhao --- xen/drivers/acpi/tables.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 1da2127..6085fda 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -329,7 +329,12 @@ static void __init check_multiple_madt(void) int __init acpi_table_init(void) { - acpi_initialize_tables(NULL, ACPI_MAX_TABLES, 0); + acpi_status status; + + status = acpi_initialize_tables(NULL, ACPI_MAX_TABLES, 0); + if (ACPI_FAILURE(status)) + return 1; + check_multiple_madt(); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKty-0001Wy-VV; Tue, 22 Sep 2015 10:34:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKty-0001Wb-BU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:22 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 50/3B-03819-DAE21065; Tue, 22 Sep 2015 10:34:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1442918058!36844756!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26585 invoked from network); 22 Sep 2015 10:34:19 -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; 22 Sep 2015 10:34:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtu-0007bT-NP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtu-0002s0-M4 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:18 +0000 Date: Tue, 22 Sep 2015 10:34:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ACPI / table: Replace '1' with specific error return values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f025e6ddde98819083aadee11f776180cf5c6dce Author: Hanjun Guo AuthorDate: Wed Sep 9 16:26:37 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:26:37 2015 +0200 ACPI / table: Replace '1' with specific error return values After commit 7f8f97c3cc (ACPI: acpi_table_parse() now returns success/fail, not count), acpi_table_parse() returns '1' when it is unable to find the table, but it should return a negative error code in that case. Make it return -ENODEV instead. Fix the same problem in acpi_table_init() analogously. Signed-off-by: Hanjun Guo [rjw: Subject and changelog] Signed-off-by: Rafael J. Wysocki [Linux commit 95df812dbdc350bfcf31e247e9100c378a472480] Signed-off-by: Shannon Zhao --- xen/drivers/acpi/tables.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 6085fda..60c4ab1 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -290,7 +290,7 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) if (table) { return handler(table); } else - return 1; + return -ENODEV; } /* @@ -333,7 +333,7 @@ int __init acpi_table_init(void) status = acpi_initialize_tables(NULL, ACPI_MAX_TABLES, 0); if (ACPI_FAILURE(status)) - return 1; + return -EINVAL; check_multiple_madt(); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKty-0001Wy-VV; Tue, 22 Sep 2015 10:34:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKty-0001Wb-BU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:22 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 50/3B-03819-DAE21065; Tue, 22 Sep 2015 10:34:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1442918058!36844756!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26585 invoked from network); 22 Sep 2015 10:34:19 -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; 22 Sep 2015 10:34:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKtu-0007bT-NP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKtu-0002s0-M4 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:18 +0000 Date: Tue, 22 Sep 2015 10:34:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ACPI / table: Replace '1' with specific error return values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f025e6ddde98819083aadee11f776180cf5c6dce Author: Hanjun Guo AuthorDate: Wed Sep 9 16:26:37 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:26:37 2015 +0200 ACPI / table: Replace '1' with specific error return values After commit 7f8f97c3cc (ACPI: acpi_table_parse() now returns success/fail, not count), acpi_table_parse() returns '1' when it is unable to find the table, but it should return a negative error code in that case. Make it return -ENODEV instead. Fix the same problem in acpi_table_init() analogously. Signed-off-by: Hanjun Guo [rjw: Subject and changelog] Signed-off-by: Rafael J. Wysocki [Linux commit 95df812dbdc350bfcf31e247e9100c378a472480] Signed-off-by: Shannon Zhao --- xen/drivers/acpi/tables.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 6085fda..60c4ab1 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -290,7 +290,7 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) if (table) { return handler(table); } else - return 1; + return -ENODEV; } /* @@ -333,7 +333,7 @@ int __init acpi_table_init(void) status = acpi_initialize_tables(NULL, ACPI_MAX_TABLES, 0); if (ACPI_FAILURE(status)) - return 1; + return -EINVAL; check_multiple_madt(); return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKu9-0001b5-4U; Tue, 22 Sep 2015 10:34:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKu8-0001ae-Aw for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:32 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 98/EC-01753-7BE21065; Tue, 22 Sep 2015 10:34:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442918069!46483353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18565 invoked from network); 22 Sep 2015 10:34:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKu4-0007bf-Tc for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKu4-0002sy-S1 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:28 +0000 Date: Tue, 22 Sep 2015 10:34:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: clean up vm_event-related code in asm-x86/domain.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 780f119c8b073b36bcc098ef7b7f70fd1dc17c96 Author: Razvan Cojocaru AuthorDate: Wed Sep 9 16:27:24 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:27:24 2015 +0200 x86: clean up vm_event-related code in asm-x86/domain.h As suggested by Jan Beulich, moved struct monitor_write_data from struct arch_domain to struct arch_vcpu, as well as moving all vm_event-related data from asm-x86/domain.h to struct vm_event, and allocating it dynamically only when needed. Suggested-by: Jan Beulich Signed-off-by: Razvan Cojocaru Acked-by: Tamas K Lengyel Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 10 ++-------- xen/arch/x86/hvm/emulate.c | 7 ++++--- xen/arch/x86/hvm/hvm.c | 40 +++++++++++++++++++--------------------- xen/arch/x86/mm/p2m.c | 25 +++++++++++++------------ xen/arch/x86/vm_event.c | 26 +++++++------------------- xen/include/asm-x86/domain.h | 13 +------------ xen/include/asm-x86/vm_event.h | 12 ++++++++++++ 7 files changed, 58 insertions(+), 75 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 045f6ff..58e173e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -424,9 +424,6 @@ int vcpu_initialise(struct vcpu *v) v->arch.flags = TF_kernel_mode; - /* By default, do not emulate */ - v->arch.vm_event.emulate_flags = 0; - rc = mapcache_vcpu_init(v); if ( rc ) return rc; @@ -511,8 +508,8 @@ int vcpu_initialise(struct vcpu *v) void vcpu_destroy(struct vcpu *v) { - xfree(v->arch.vm_event.emul_read_data); - v->arch.vm_event.emul_read_data = NULL; + xfree(v->arch.vm_event); + v->arch.vm_event = NULL; if ( is_pv_32bit_vcpu(v) ) { @@ -668,9 +665,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, void arch_domain_destroy(struct domain *d) { - vfree(d->arch.event_write_data); - d->arch.event_write_data = NULL; - if ( has_hvm_container_domain(d) ) hvm_domain_destroy(d); diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 30acb78..5934c72 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -22,6 +22,7 @@ #include #include #include +#include static void hvmtrace_io_assist(const ioreq_t *p) { @@ -71,12 +72,12 @@ static int set_context_data(void *buffer, unsigned int size) { struct vcpu *curr = current; - if ( curr->arch.vm_event.emul_read_data ) + if ( curr->arch.vm_event ) { unsigned int safe_size = - min(size, curr->arch.vm_event.emul_read_data->size); + min(size, curr->arch.vm_event->emul_read_data.size); - memcpy(buffer, curr->arch.vm_event.emul_read_data->data, safe_size); + memcpy(buffer, curr->arch.vm_event->emul_read_data.data, safe_size); memset(buffer + safe_size, 0, size - safe_size); return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 615fa89..fd21962 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -541,9 +542,9 @@ void hvm_do_resume(struct vcpu *v) break; } - if ( unlikely(d->arch.event_write_data) ) + if ( unlikely(v->arch.vm_event) ) { - struct monitor_write_data *w = &d->arch.event_write_data[v->vcpu_id]; + struct monitor_write_data *w = &v->arch.vm_event->write_data; if ( w->do_write.msr ) { @@ -3337,7 +3338,6 @@ int hvm_set_cr0(unsigned long value, bool_t may_defer) struct domain *d = v->domain; unsigned long gfn, old_value = v->arch.hvm_vcpu.guest_cr[0]; struct page_info *page; - struct arch_domain *currad = &v->domain->arch; HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR0 value = %lx", value); @@ -3367,16 +3367,16 @@ int hvm_set_cr0(unsigned long value, bool_t may_defer) goto gpf; } - if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & + if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR0)) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); if ( hvm_event_crX(CR0, value, old_value) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - currad->event_write_data[v->vcpu_id].do_write.cr0 = 1; - currad->event_write_data[v->vcpu_id].cr0 = value; + v->arch.vm_event->write_data.do_write.cr0 = 1; + v->arch.vm_event->write_data.cr0 = value; return X86EMUL_OKAY; } @@ -3468,18 +3468,17 @@ int hvm_set_cr3(unsigned long value, bool_t may_defer) struct vcpu *v = current; struct page_info *page; unsigned long old = v->arch.hvm_vcpu.guest_cr[3]; - struct arch_domain *currad = &v->domain->arch; - if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & + if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); if ( hvm_event_crX(CR3, value, old) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - currad->event_write_data[v->vcpu_id].do_write.cr3 = 1; - currad->event_write_data[v->vcpu_id].cr3 = value; + v->arch.vm_event->write_data.do_write.cr3 = 1; + v->arch.vm_event->write_data.cr3 = value; return X86EMUL_OKAY; } @@ -3515,7 +3514,6 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) { struct vcpu *v = current; unsigned long old_cr; - struct arch_domain *currad = &v->domain->arch; if ( value & hvm_cr4_guest_reserved_bits(v, 0) ) { @@ -3543,16 +3541,16 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) goto gpf; } - if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & + if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR4)) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); if ( hvm_event_crX(CR4, value, old_cr) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - currad->event_write_data[v->vcpu_id].do_write.cr4 = 1; - currad->event_write_data[v->vcpu_id].cr4 = value; + v->arch.vm_event->write_data.do_write.cr4 = 1; + v->arch.vm_event->write_data.cr4 = value; return X86EMUL_OKAY; } @@ -4752,12 +4750,12 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content, if ( may_defer && unlikely(currad->monitor.mov_to_msr_enabled) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); /* The actual write will occur in hvm_do_resume() (if permitted). */ - currad->event_write_data[v->vcpu_id].do_write.msr = 1; - currad->event_write_data[v->vcpu_id].msr = msr; - currad->event_write_data[v->vcpu_id].value = msr_content; + v->arch.vm_event->write_data.do_write.msr = 1; + v->arch.vm_event->write_data.msr = msr; + v->arch.vm_event->write_data.value = msr_content; hvm_event_msr(msr, msr_content); return X86EMUL_OKAY; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b2726bd..c4329d2 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "mm-locks.h" @@ -1591,11 +1592,10 @@ void p2m_mem_access_emulate_check(struct vcpu *v, } } - v->arch.vm_event.emulate_flags = violation ? rsp->flags : 0; + v->arch.vm_event->emulate_flags = violation ? rsp->flags : 0; - if ( (rsp->flags & VM_EVENT_FLAG_SET_EMUL_READ_DATA) && - v->arch.vm_event.emul_read_data ) - *v->arch.vm_event.emul_read_data = rsp->data.emul_read_data; + if ( (rsp->flags & VM_EVENT_FLAG_SET_EMUL_READ_DATA) ) + v->arch.vm_event->emul_read_data = rsp->data.emul_read_data; } } @@ -1678,34 +1678,35 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, } /* The previous vm_event reply does not match the current state. */ - if ( v->arch.vm_event.gpa != gpa || v->arch.vm_event.eip != eip ) + if ( unlikely(v->arch.vm_event) && + (v->arch.vm_event->gpa != gpa || v->arch.vm_event->eip != eip) ) { /* Don't emulate the current instruction, send a new vm_event. */ - v->arch.vm_event.emulate_flags = 0; + v->arch.vm_event->emulate_flags = 0; /* * Make sure to mark the current state to match it again against * the new vm_event about to be sent. */ - v->arch.vm_event.gpa = gpa; - v->arch.vm_event.eip = eip; + v->arch.vm_event->gpa = gpa; + v->arch.vm_event->eip = eip; } - if ( v->arch.vm_event.emulate_flags ) + if ( unlikely(v->arch.vm_event) && v->arch.vm_event->emulate_flags ) { enum emul_kind kind = EMUL_KIND_NORMAL; - if ( v->arch.vm_event.emulate_flags & + if ( v->arch.vm_event->emulate_flags & VM_EVENT_FLAG_SET_EMUL_READ_DATA ) kind = EMUL_KIND_SET_CONTEXT; - else if ( v->arch.vm_event.emulate_flags & + else if ( v->arch.vm_event->emulate_flags & VM_EVENT_FLAG_EMULATE_NOWRITE ) kind = EMUL_KIND_NOWRITE; hvm_mem_access_emulate_one(kind, TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); - v->arch.vm_event.emulate_flags = 0; + v->arch.vm_event->emulate_flags = 0; return 1; } diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index b32a839..e4e0aa4 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -27,22 +27,14 @@ int vm_event_init_domain(struct domain *d) { struct vcpu *v; - if ( !d->arch.event_write_data ) - d->arch.event_write_data = - vzalloc(sizeof(struct monitor_write_data) * d->max_vcpus); - - if ( !d->arch.event_write_data ) - return -ENOMEM; - for_each_vcpu ( d, v ) { - if ( v->arch.vm_event.emul_read_data ) + if ( v->arch.vm_event ) continue; - v->arch.vm_event.emul_read_data = - xzalloc(struct vm_event_emul_read_data); + v->arch.vm_event = xzalloc(struct arch_vm_event); - if ( !v->arch.vm_event.emul_read_data ) + if ( !v->arch.vm_event ) return -ENOMEM; } @@ -57,13 +49,10 @@ void vm_event_cleanup_domain(struct domain *d) { struct vcpu *v; - vfree(d->arch.event_write_data); - d->arch.event_write_data = NULL; - for_each_vcpu ( d, v ) { - xfree(v->arch.vm_event.emul_read_data); - v->arch.vm_event.emul_read_data = NULL; + xfree(v->arch.vm_event); + v->arch.vm_event = NULL; } } @@ -79,10 +68,9 @@ void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *rsp) { if ( rsp->flags & VM_EVENT_FLAG_DENY ) { - struct monitor_write_data *w = - &v->domain->arch.event_write_data[v->vcpu_id]; + struct monitor_write_data *w = &v->arch.vm_event->write_data; - ASSERT(v->domain->arch.event_write_data != NULL); + ASSERT(w); switch ( rsp->reason ) { diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 0fce09e..680e2d8 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -385,8 +385,6 @@ struct arch_domain /* Mem_access emulation control */ bool_t mem_access_emulate_enabled; - - struct monitor_write_data *event_write_data; } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) @@ -533,16 +531,7 @@ struct arch_vcpu /* A secondary copy of the vcpu time info. */ XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; - /* - * Should we emulate the next matching instruction on VCPU resume - * after a vm_event? - */ - struct { - uint32_t emulate_flags; - unsigned long gpa; - unsigned long eip; - struct vm_event_emul_read_data *emul_read_data; - } vm_event; + struct arch_vm_event *vm_event; }; smap_check_policy_t smap_policy_change(struct vcpu *v, diff --git a/xen/include/asm-x86/vm_event.h b/xen/include/asm-x86/vm_event.h index 0ae5952..2ff2cab 100644 --- a/xen/include/asm-x86/vm_event.h +++ b/xen/include/asm-x86/vm_event.h @@ -22,6 +22,18 @@ #include #include +/* + * Should we emulate the next matching instruction on VCPU resume + * after a vm_event? + */ +struct arch_vm_event { + uint32_t emulate_flags; + unsigned long gpa; + unsigned long eip; + struct vm_event_emul_read_data emul_read_data; + struct monitor_write_data write_data; +}; + int vm_event_init_domain(struct domain *d); void vm_event_cleanup_domain(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKu9-0001b5-4U; Tue, 22 Sep 2015 10:34:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKu8-0001ae-Aw for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:32 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 98/EC-01753-7BE21065; Tue, 22 Sep 2015 10:34:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442918069!46483353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18565 invoked from network); 22 Sep 2015 10:34:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKu4-0007bf-Tc for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKu4-0002sy-S1 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:28 +0000 Date: Tue, 22 Sep 2015 10:34:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: clean up vm_event-related code in asm-x86/domain.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 780f119c8b073b36bcc098ef7b7f70fd1dc17c96 Author: Razvan Cojocaru AuthorDate: Wed Sep 9 16:27:24 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:27:24 2015 +0200 x86: clean up vm_event-related code in asm-x86/domain.h As suggested by Jan Beulich, moved struct monitor_write_data from struct arch_domain to struct arch_vcpu, as well as moving all vm_event-related data from asm-x86/domain.h to struct vm_event, and allocating it dynamically only when needed. Suggested-by: Jan Beulich Signed-off-by: Razvan Cojocaru Acked-by: Tamas K Lengyel Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 10 ++-------- xen/arch/x86/hvm/emulate.c | 7 ++++--- xen/arch/x86/hvm/hvm.c | 40 +++++++++++++++++++--------------------- xen/arch/x86/mm/p2m.c | 25 +++++++++++++------------ xen/arch/x86/vm_event.c | 26 +++++++------------------- xen/include/asm-x86/domain.h | 13 +------------ xen/include/asm-x86/vm_event.h | 12 ++++++++++++ 7 files changed, 58 insertions(+), 75 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 045f6ff..58e173e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -424,9 +424,6 @@ int vcpu_initialise(struct vcpu *v) v->arch.flags = TF_kernel_mode; - /* By default, do not emulate */ - v->arch.vm_event.emulate_flags = 0; - rc = mapcache_vcpu_init(v); if ( rc ) return rc; @@ -511,8 +508,8 @@ int vcpu_initialise(struct vcpu *v) void vcpu_destroy(struct vcpu *v) { - xfree(v->arch.vm_event.emul_read_data); - v->arch.vm_event.emul_read_data = NULL; + xfree(v->arch.vm_event); + v->arch.vm_event = NULL; if ( is_pv_32bit_vcpu(v) ) { @@ -668,9 +665,6 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, void arch_domain_destroy(struct domain *d) { - vfree(d->arch.event_write_data); - d->arch.event_write_data = NULL; - if ( has_hvm_container_domain(d) ) hvm_domain_destroy(d); diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 30acb78..5934c72 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -22,6 +22,7 @@ #include #include #include +#include static void hvmtrace_io_assist(const ioreq_t *p) { @@ -71,12 +72,12 @@ static int set_context_data(void *buffer, unsigned int size) { struct vcpu *curr = current; - if ( curr->arch.vm_event.emul_read_data ) + if ( curr->arch.vm_event ) { unsigned int safe_size = - min(size, curr->arch.vm_event.emul_read_data->size); + min(size, curr->arch.vm_event->emul_read_data.size); - memcpy(buffer, curr->arch.vm_event.emul_read_data->data, safe_size); + memcpy(buffer, curr->arch.vm_event->emul_read_data.data, safe_size); memset(buffer + safe_size, 0, size - safe_size); return X86EMUL_OKAY; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 615fa89..fd21962 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -541,9 +542,9 @@ void hvm_do_resume(struct vcpu *v) break; } - if ( unlikely(d->arch.event_write_data) ) + if ( unlikely(v->arch.vm_event) ) { - struct monitor_write_data *w = &d->arch.event_write_data[v->vcpu_id]; + struct monitor_write_data *w = &v->arch.vm_event->write_data; if ( w->do_write.msr ) { @@ -3337,7 +3338,6 @@ int hvm_set_cr0(unsigned long value, bool_t may_defer) struct domain *d = v->domain; unsigned long gfn, old_value = v->arch.hvm_vcpu.guest_cr[0]; struct page_info *page; - struct arch_domain *currad = &v->domain->arch; HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR0 value = %lx", value); @@ -3367,16 +3367,16 @@ int hvm_set_cr0(unsigned long value, bool_t may_defer) goto gpf; } - if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & + if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR0)) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); if ( hvm_event_crX(CR0, value, old_value) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - currad->event_write_data[v->vcpu_id].do_write.cr0 = 1; - currad->event_write_data[v->vcpu_id].cr0 = value; + v->arch.vm_event->write_data.do_write.cr0 = 1; + v->arch.vm_event->write_data.cr0 = value; return X86EMUL_OKAY; } @@ -3468,18 +3468,17 @@ int hvm_set_cr3(unsigned long value, bool_t may_defer) struct vcpu *v = current; struct page_info *page; unsigned long old = v->arch.hvm_vcpu.guest_cr[3]; - struct arch_domain *currad = &v->domain->arch; - if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & + if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); if ( hvm_event_crX(CR3, value, old) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - currad->event_write_data[v->vcpu_id].do_write.cr3 = 1; - currad->event_write_data[v->vcpu_id].cr3 = value; + v->arch.vm_event->write_data.do_write.cr3 = 1; + v->arch.vm_event->write_data.cr3 = value; return X86EMUL_OKAY; } @@ -3515,7 +3514,6 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) { struct vcpu *v = current; unsigned long old_cr; - struct arch_domain *currad = &v->domain->arch; if ( value & hvm_cr4_guest_reserved_bits(v, 0) ) { @@ -3543,16 +3541,16 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) goto gpf; } - if ( may_defer && unlikely(currad->monitor.write_ctrlreg_enabled & + if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR4)) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); if ( hvm_event_crX(CR4, value, old_cr) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - currad->event_write_data[v->vcpu_id].do_write.cr4 = 1; - currad->event_write_data[v->vcpu_id].cr4 = value; + v->arch.vm_event->write_data.do_write.cr4 = 1; + v->arch.vm_event->write_data.cr4 = value; return X86EMUL_OKAY; } @@ -4752,12 +4750,12 @@ int hvm_msr_write_intercept(unsigned int msr, uint64_t msr_content, if ( may_defer && unlikely(currad->monitor.mov_to_msr_enabled) ) { - ASSERT(currad->event_write_data != NULL); + ASSERT(v->arch.vm_event); /* The actual write will occur in hvm_do_resume() (if permitted). */ - currad->event_write_data[v->vcpu_id].do_write.msr = 1; - currad->event_write_data[v->vcpu_id].msr = msr; - currad->event_write_data[v->vcpu_id].value = msr_content; + v->arch.vm_event->write_data.do_write.msr = 1; + v->arch.vm_event->write_data.msr = msr; + v->arch.vm_event->write_data.value = msr_content; hvm_event_msr(msr, msr_content); return X86EMUL_OKAY; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index b2726bd..c4329d2 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include "mm-locks.h" @@ -1591,11 +1592,10 @@ void p2m_mem_access_emulate_check(struct vcpu *v, } } - v->arch.vm_event.emulate_flags = violation ? rsp->flags : 0; + v->arch.vm_event->emulate_flags = violation ? rsp->flags : 0; - if ( (rsp->flags & VM_EVENT_FLAG_SET_EMUL_READ_DATA) && - v->arch.vm_event.emul_read_data ) - *v->arch.vm_event.emul_read_data = rsp->data.emul_read_data; + if ( (rsp->flags & VM_EVENT_FLAG_SET_EMUL_READ_DATA) ) + v->arch.vm_event->emul_read_data = rsp->data.emul_read_data; } } @@ -1678,34 +1678,35 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, } /* The previous vm_event reply does not match the current state. */ - if ( v->arch.vm_event.gpa != gpa || v->arch.vm_event.eip != eip ) + if ( unlikely(v->arch.vm_event) && + (v->arch.vm_event->gpa != gpa || v->arch.vm_event->eip != eip) ) { /* Don't emulate the current instruction, send a new vm_event. */ - v->arch.vm_event.emulate_flags = 0; + v->arch.vm_event->emulate_flags = 0; /* * Make sure to mark the current state to match it again against * the new vm_event about to be sent. */ - v->arch.vm_event.gpa = gpa; - v->arch.vm_event.eip = eip; + v->arch.vm_event->gpa = gpa; + v->arch.vm_event->eip = eip; } - if ( v->arch.vm_event.emulate_flags ) + if ( unlikely(v->arch.vm_event) && v->arch.vm_event->emulate_flags ) { enum emul_kind kind = EMUL_KIND_NORMAL; - if ( v->arch.vm_event.emulate_flags & + if ( v->arch.vm_event->emulate_flags & VM_EVENT_FLAG_SET_EMUL_READ_DATA ) kind = EMUL_KIND_SET_CONTEXT; - else if ( v->arch.vm_event.emulate_flags & + else if ( v->arch.vm_event->emulate_flags & VM_EVENT_FLAG_EMULATE_NOWRITE ) kind = EMUL_KIND_NOWRITE; hvm_mem_access_emulate_one(kind, TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); - v->arch.vm_event.emulate_flags = 0; + v->arch.vm_event->emulate_flags = 0; return 1; } diff --git a/xen/arch/x86/vm_event.c b/xen/arch/x86/vm_event.c index b32a839..e4e0aa4 100644 --- a/xen/arch/x86/vm_event.c +++ b/xen/arch/x86/vm_event.c @@ -27,22 +27,14 @@ int vm_event_init_domain(struct domain *d) { struct vcpu *v; - if ( !d->arch.event_write_data ) - d->arch.event_write_data = - vzalloc(sizeof(struct monitor_write_data) * d->max_vcpus); - - if ( !d->arch.event_write_data ) - return -ENOMEM; - for_each_vcpu ( d, v ) { - if ( v->arch.vm_event.emul_read_data ) + if ( v->arch.vm_event ) continue; - v->arch.vm_event.emul_read_data = - xzalloc(struct vm_event_emul_read_data); + v->arch.vm_event = xzalloc(struct arch_vm_event); - if ( !v->arch.vm_event.emul_read_data ) + if ( !v->arch.vm_event ) return -ENOMEM; } @@ -57,13 +49,10 @@ void vm_event_cleanup_domain(struct domain *d) { struct vcpu *v; - vfree(d->arch.event_write_data); - d->arch.event_write_data = NULL; - for_each_vcpu ( d, v ) { - xfree(v->arch.vm_event.emul_read_data); - v->arch.vm_event.emul_read_data = NULL; + xfree(v->arch.vm_event); + v->arch.vm_event = NULL; } } @@ -79,10 +68,9 @@ void vm_event_register_write_resume(struct vcpu *v, vm_event_response_t *rsp) { if ( rsp->flags & VM_EVENT_FLAG_DENY ) { - struct monitor_write_data *w = - &v->domain->arch.event_write_data[v->vcpu_id]; + struct monitor_write_data *w = &v->arch.vm_event->write_data; - ASSERT(v->domain->arch.event_write_data != NULL); + ASSERT(w); switch ( rsp->reason ) { diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 0fce09e..680e2d8 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -385,8 +385,6 @@ struct arch_domain /* Mem_access emulation control */ bool_t mem_access_emulate_enabled; - - struct monitor_write_data *event_write_data; } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) @@ -533,16 +531,7 @@ struct arch_vcpu /* A secondary copy of the vcpu time info. */ XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; - /* - * Should we emulate the next matching instruction on VCPU resume - * after a vm_event? - */ - struct { - uint32_t emulate_flags; - unsigned long gpa; - unsigned long eip; - struct vm_event_emul_read_data *emul_read_data; - } vm_event; + struct arch_vm_event *vm_event; }; smap_check_policy_t smap_policy_change(struct vcpu *v, diff --git a/xen/include/asm-x86/vm_event.h b/xen/include/asm-x86/vm_event.h index 0ae5952..2ff2cab 100644 --- a/xen/include/asm-x86/vm_event.h +++ b/xen/include/asm-x86/vm_event.h @@ -22,6 +22,18 @@ #include #include +/* + * Should we emulate the next matching instruction on VCPU resume + * after a vm_event? + */ +struct arch_vm_event { + uint32_t emulate_flags; + unsigned long gpa; + unsigned long eip; + struct vm_event_emul_read_data emul_read_data; + struct monitor_write_data write_data; +}; + int vm_event_init_domain(struct domain *d); void vm_event_cleanup_domain(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuJ-0001eL-7C; Tue, 22 Sep 2015 10:34:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuH-0001dt-UH for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:42 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id B3/7C-31450-1CE21065; Tue, 22 Sep 2015 10:34:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1442918079!4739910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29976 invoked from network); 22 Sep 2015 10:34:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuF-0007bn-5B for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuF-0002td-1L for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:39 +0000 Date: Tue, 22 Sep 2015 10:34:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: wrap kexec feature with CONFIG_KEXEC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c21f69e8a113818639027c7cd86773777c85fe3d Author: Jonathan Creekmore AuthorDate: Wed Sep 9 16:28:27 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:28:27 2015 +0200 x86: wrap kexec feature with CONFIG_KEXEC Add the appropriate #if checks around the kexec code in the x86 codebase so that the feature can actually be turned off by the flag instead of always required to be enabled on x86. Signed-off-by: Jonathan Creekmore Reviewed-by: Andrew Cooper Acked-by: David Vrabel --- xen/Rules.mk | 6 ++++++ xen/arch/x86/Makefile | 4 ++-- xen/arch/x86/setup.c | 6 ++++++ xen/arch/x86/x86_64/compat/entry.S | 4 ++++ xen/arch/x86/x86_64/entry.S | 4 ++++ xen/common/Makefile | 4 ++-- xen/include/asm-x86/config.h | 1 - xen/include/xen/kexec.h | 6 ++++++ 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index feb08d6..bf19d20 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -10,6 +10,7 @@ lock_profile ?= n crash_debug ?= n frame_pointer ?= n lto ?= n +kexec ?= y include $(XEN_ROOT)/Config.mk @@ -72,6 +73,11 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif +CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec) +CONFIG_KEXEC := $(CONFIG_KEXEC-y) + +CFLAGS-$(CONFIG_KEXEC) += -DCONFIG_KEXEC + AFLAGS-y += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h # Clang's built-in assembler can't handle .code16/.code32/.code64 yet diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 5f24951..39a8059 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -14,6 +14,7 @@ obj-bin-y += bzimage.init.o obj-bin-y += clear_page.o obj-bin-y += copy_page.o obj-y += compat.o +obj-$(CONFIG_KEXEC) += crash.o obj-y += debug.o obj-y += delay.o obj-bin-y += dmi_scan.init.o @@ -31,6 +32,7 @@ obj-y += io_apic.o obj-y += msi.o obj-y += ioport_emulate.o obj-y += irq.o +obj-$(CONFIG_KEXEC) += machine_kexec.o obj-y += microcode_amd.o obj-y += microcode_intel.o # This must come after the vendor specific files. @@ -56,8 +58,6 @@ obj-y += trace.o obj-y += traps.o obj-y += usercopy.o obj-y += x86_emulate.o -obj-y += machine_kexec.o -obj-y += crash.o obj-y += tboot.o obj-y += hpet.o obj-y += vm_event.o diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 3946e4c..3f4868e 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -481,6 +481,7 @@ static void __init parse_video_info(void) static void __init kexec_reserve_area(struct e820map *e820) { +#ifdef CONFIG_KEXEC unsigned long kdump_start = kexec_crash_area.start; unsigned long kdump_size = kexec_crash_area.size; static bool_t __initdata is_reserved = 0; @@ -503,6 +504,7 @@ static void __init kexec_reserve_area(struct e820map *e820) printk("Kdump: %luMB (%lukB) at %#lx\n", kdump_size >> 20, kdump_size >> 10, kdump_start); } +#endif } static void noinline init_done(void) @@ -973,6 +975,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) } } +#ifdef CONFIG_KEXEC /* Don't overlap with modules. */ e = consider_modules(s, e, PAGE_ALIGN(kexec_crash_area.size), mod, mbi->mods_count, -1); @@ -981,6 +984,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) e = (e - kexec_crash_area.size) & PAGE_MASK; kexec_crash_area.start = e; } +#endif } if ( modules_headroom && !mod->reserved ) @@ -1125,6 +1129,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) PFN_UP(mod[i].mod_end), PAGE_HYPERVISOR); } +#ifdef CONFIG_KEXEC if ( kexec_crash_area.size ) { unsigned long s = PFN_DOWN(kexec_crash_area.start); @@ -1135,6 +1140,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) map_pages_to_xen((unsigned long)__va(kexec_crash_area.start), s, e - s, PAGE_HYPERVISOR); } +#endif xen_virt_end = ((unsigned long)_end + (1UL << L2_PAGETABLE_SHIFT) - 1) & ~((1UL << L2_PAGETABLE_SHIFT) - 1); diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 1521779..3088aa7 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -390,6 +390,10 @@ compat_crash_page_fault: .section .rodata, "a", @progbits +#ifndef CONFIG_KEXEC +#define compat_kexec_op do_ni_hypercall +#endif + ENTRY(compat_hypercall_table) .quad compat_set_trap_table /* 0 */ .quad do_mmu_update diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 74677a2..28c3214 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -723,6 +723,10 @@ ENTRY(exception_table) .endr .size exception_table, . - exception_table +#ifndef CONFIG_KEXEC +#define do_kexec_op do_ni_hypercall +#endif + ENTRY(hypercall_table) .quad do_set_trap_table /* 0 */ .quad do_mmu_update diff --git a/xen/common/Makefile b/xen/common/Makefile index 3fdf931..1726fac 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -13,8 +13,8 @@ obj-y += guestcopy.o obj-y += irq.o obj-y += kernel.o obj-y += keyhandler.o -obj-$(HAS_KEXEC) += kexec.o -obj-$(HAS_KEXEC) += kimage.o +obj-$(CONFIG_KEXEC) += kexec.o +obj-$(CONFIG_KEXEC) += kimage.o obj-y += lib.o obj-y += lzo.o obj-$(HAS_MEM_ACCESS) += mem_access.o diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3e9be83..52f7ca8 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -48,7 +48,6 @@ #define CONFIG_HOTPLUG_CPU 1 #define CONFIG_XENOPROF 1 -#define CONFIG_KEXEC 1 #define CONFIG_WATCHDOG 1 #define CONFIG_MULTIBOOT 1 diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index b7d121d..baaeb88 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -79,6 +79,12 @@ void vmcoreinfo_append_str(const char *fmt, ...) #else /* !CONFIG_KEXEC */ #define crashinfo_maxaddr_bits 0 +#define kexecing 0 + +static inline void kexec_early_calculations(void) {} +static inline void kexec_crash(void) {} +static inline void kexec_crash_save_cpu(void) {} +static inline void set_kexec_crash_area_size(u64 system_ram) {} #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuJ-0001eL-7C; Tue, 22 Sep 2015 10:34:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuH-0001dt-UH for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:42 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id B3/7C-31450-1CE21065; Tue, 22 Sep 2015 10:34:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1442918079!4739910!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29976 invoked from network); 22 Sep 2015 10:34:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuF-0007bn-5B for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuF-0002td-1L for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:39 +0000 Date: Tue, 22 Sep 2015 10:34:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: wrap kexec feature with CONFIG_KEXEC X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c21f69e8a113818639027c7cd86773777c85fe3d Author: Jonathan Creekmore AuthorDate: Wed Sep 9 16:28:27 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:28:27 2015 +0200 x86: wrap kexec feature with CONFIG_KEXEC Add the appropriate #if checks around the kexec code in the x86 codebase so that the feature can actually be turned off by the flag instead of always required to be enabled on x86. Signed-off-by: Jonathan Creekmore Reviewed-by: Andrew Cooper Acked-by: David Vrabel --- xen/Rules.mk | 6 ++++++ xen/arch/x86/Makefile | 4 ++-- xen/arch/x86/setup.c | 6 ++++++ xen/arch/x86/x86_64/compat/entry.S | 4 ++++ xen/arch/x86/x86_64/entry.S | 4 ++++ xen/common/Makefile | 4 ++-- xen/include/asm-x86/config.h | 1 - xen/include/xen/kexec.h | 6 ++++++ 8 files changed, 30 insertions(+), 5 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index feb08d6..bf19d20 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -10,6 +10,7 @@ lock_profile ?= n crash_debug ?= n frame_pointer ?= n lto ?= n +kexec ?= y include $(XEN_ROOT)/Config.mk @@ -72,6 +73,11 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif +CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec) +CONFIG_KEXEC := $(CONFIG_KEXEC-y) + +CFLAGS-$(CONFIG_KEXEC) += -DCONFIG_KEXEC + AFLAGS-y += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h # Clang's built-in assembler can't handle .code16/.code32/.code64 yet diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 5f24951..39a8059 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -14,6 +14,7 @@ obj-bin-y += bzimage.init.o obj-bin-y += clear_page.o obj-bin-y += copy_page.o obj-y += compat.o +obj-$(CONFIG_KEXEC) += crash.o obj-y += debug.o obj-y += delay.o obj-bin-y += dmi_scan.init.o @@ -31,6 +32,7 @@ obj-y += io_apic.o obj-y += msi.o obj-y += ioport_emulate.o obj-y += irq.o +obj-$(CONFIG_KEXEC) += machine_kexec.o obj-y += microcode_amd.o obj-y += microcode_intel.o # This must come after the vendor specific files. @@ -56,8 +58,6 @@ obj-y += trace.o obj-y += traps.o obj-y += usercopy.o obj-y += x86_emulate.o -obj-y += machine_kexec.o -obj-y += crash.o obj-y += tboot.o obj-y += hpet.o obj-y += vm_event.o diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 3946e4c..3f4868e 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -481,6 +481,7 @@ static void __init parse_video_info(void) static void __init kexec_reserve_area(struct e820map *e820) { +#ifdef CONFIG_KEXEC unsigned long kdump_start = kexec_crash_area.start; unsigned long kdump_size = kexec_crash_area.size; static bool_t __initdata is_reserved = 0; @@ -503,6 +504,7 @@ static void __init kexec_reserve_area(struct e820map *e820) printk("Kdump: %luMB (%lukB) at %#lx\n", kdump_size >> 20, kdump_size >> 10, kdump_start); } +#endif } static void noinline init_done(void) @@ -973,6 +975,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) } } +#ifdef CONFIG_KEXEC /* Don't overlap with modules. */ e = consider_modules(s, e, PAGE_ALIGN(kexec_crash_area.size), mod, mbi->mods_count, -1); @@ -981,6 +984,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) e = (e - kexec_crash_area.size) & PAGE_MASK; kexec_crash_area.start = e; } +#endif } if ( modules_headroom && !mod->reserved ) @@ -1125,6 +1129,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) PFN_UP(mod[i].mod_end), PAGE_HYPERVISOR); } +#ifdef CONFIG_KEXEC if ( kexec_crash_area.size ) { unsigned long s = PFN_DOWN(kexec_crash_area.start); @@ -1135,6 +1140,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) map_pages_to_xen((unsigned long)__va(kexec_crash_area.start), s, e - s, PAGE_HYPERVISOR); } +#endif xen_virt_end = ((unsigned long)_end + (1UL << L2_PAGETABLE_SHIFT) - 1) & ~((1UL << L2_PAGETABLE_SHIFT) - 1); diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 1521779..3088aa7 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -390,6 +390,10 @@ compat_crash_page_fault: .section .rodata, "a", @progbits +#ifndef CONFIG_KEXEC +#define compat_kexec_op do_ni_hypercall +#endif + ENTRY(compat_hypercall_table) .quad compat_set_trap_table /* 0 */ .quad do_mmu_update diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 74677a2..28c3214 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -723,6 +723,10 @@ ENTRY(exception_table) .endr .size exception_table, . - exception_table +#ifndef CONFIG_KEXEC +#define do_kexec_op do_ni_hypercall +#endif + ENTRY(hypercall_table) .quad do_set_trap_table /* 0 */ .quad do_mmu_update diff --git a/xen/common/Makefile b/xen/common/Makefile index 3fdf931..1726fac 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -13,8 +13,8 @@ obj-y += guestcopy.o obj-y += irq.o obj-y += kernel.o obj-y += keyhandler.o -obj-$(HAS_KEXEC) += kexec.o -obj-$(HAS_KEXEC) += kimage.o +obj-$(CONFIG_KEXEC) += kexec.o +obj-$(CONFIG_KEXEC) += kimage.o obj-y += lib.o obj-y += lzo.o obj-$(HAS_MEM_ACCESS) += mem_access.o diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3e9be83..52f7ca8 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -48,7 +48,6 @@ #define CONFIG_HOTPLUG_CPU 1 #define CONFIG_XENOPROF 1 -#define CONFIG_KEXEC 1 #define CONFIG_WATCHDOG 1 #define CONFIG_MULTIBOOT 1 diff --git a/xen/include/xen/kexec.h b/xen/include/xen/kexec.h index b7d121d..baaeb88 100644 --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -79,6 +79,12 @@ void vmcoreinfo_append_str(const char *fmt, ...) #else /* !CONFIG_KEXEC */ #define crashinfo_maxaddr_bits 0 +#define kexecing 0 + +static inline void kexec_early_calculations(void) {} +static inline void kexec_crash(void) {} +static inline void kexec_crash_save_cpu(void) {} +static inline void set_kexec_crash_area_size(u64 system_ram) {} #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuU-0001hy-A1; Tue, 22 Sep 2015 10:34:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuS-0001hD-Qh for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:52 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 7E/90-12371-CCE21065; Tue, 22 Sep 2015 10:34:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1442918089!40508551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13719 invoked from network); 22 Sep 2015 10:34:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuP-0007bv-A3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuP-0002uC-8x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:49 +0000 Date: Tue, 22 Sep 2015 10:34:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: lower loglevel of XEN_DOMCTL_memory_mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdb0a9eb31d04c0fb60deab07a47c9a2545bbdfd Author: Tiejun Chen AuthorDate: Wed Sep 9 16:29:11 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:29:11 2015 +0200 domctl: lower loglevel of XEN_DOMCTL_memory_mapping We should lower loglevel to XENLOG_G_DEBUG while mapping or unmapping memory via XEN_DOMCTL_memory_mapping since its fair enough to check this info just while debugging. Signed-off-by: Tiejun Chen --- xen/common/domctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 7f959f3..3bf39f1 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1049,7 +1049,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( add ) { - printk(XENLOG_G_INFO + printk(XENLOG_G_DEBUG "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); @@ -1061,7 +1061,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } else { - printk(XENLOG_G_INFO + printk(XENLOG_G_DEBUG "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:34:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:34:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuU-0001hy-A1; Tue, 22 Sep 2015 10:34:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuS-0001hD-Qh for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:52 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 7E/90-12371-CCE21065; Tue, 22 Sep 2015 10:34:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1442918089!40508551!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13719 invoked from network); 22 Sep 2015 10:34:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:34:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuP-0007bv-A3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuP-0002uC-8x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:49 +0000 Date: Tue, 22 Sep 2015 10:34:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] domctl: lower loglevel of XEN_DOMCTL_memory_mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fdb0a9eb31d04c0fb60deab07a47c9a2545bbdfd Author: Tiejun Chen AuthorDate: Wed Sep 9 16:29:11 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 16:29:11 2015 +0200 domctl: lower loglevel of XEN_DOMCTL_memory_mapping We should lower loglevel to XENLOG_G_DEBUG while mapping or unmapping memory via XEN_DOMCTL_memory_mapping since its fair enough to check this info just while debugging. Signed-off-by: Tiejun Chen --- xen/common/domctl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 7f959f3..3bf39f1 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1049,7 +1049,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) if ( add ) { - printk(XENLOG_G_INFO + printk(XENLOG_G_DEBUG "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); @@ -1061,7 +1061,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } else { - printk(XENLOG_G_INFO + printk(XENLOG_G_DEBUG "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKud-0001l7-DA; Tue, 22 Sep 2015 10:35:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuc-0001kf-Fn for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:02 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id BB/DB-19220-5DE21065; Tue, 22 Sep 2015 10:35:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442918099!36851240!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19350 invoked from network); 22 Sep 2015 10:35:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuZ-0007c3-Pm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuZ-0002ur-Ey for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:59 +0000 Date: Tue, 22 Sep 2015 10:34:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: set 32b PVH guest mode in XEN_DOMCTL_set_address_size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad01afb7255af6755c44e34c943fc336bf4b0316 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:08:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:08:12 2015 +0200 x86/pvh: set 32b PVH guest mode in XEN_DOMCTL_set_address_size Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 27 ++++++++++++++++----------- xen/arch/x86/hvm/hvm.c | 24 +++++++++++++++++++++++- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 19 +++++++++++++++++++ xen/include/asm-x86/hvm/hvm.h | 2 ++ 5 files changed, 61 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 58e173e..a00ec97 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -366,7 +366,11 @@ int switch_native(struct domain *d) for_each_vcpu( d, v ) { free_compat_arg_xlat(v); - release_compat_l4(v); + + if ( !is_pvh_domain(d) ) + release_compat_l4(v); + else + hvm_set_mode(v, 8); } return 0; @@ -377,25 +381,26 @@ int switch_compat(struct domain *d) struct vcpu *v; int rc; - if ( is_pvh_domain(d) ) - { - printk(XENLOG_G_INFO - "Xen currently does not support 32bit PVH guests\n"); - return -EINVAL; - } - if ( !may_switch_mode(d) ) return -EACCES; if ( is_pv_32bit_domain(d) ) return 0; - d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 1; + d->arch.has_32bit_shinfo = 1; + if ( is_pv_domain(d) ) + d->arch.is_32bit_pv = 1; for_each_vcpu( d, v ) { rc = setup_compat_arg_xlat(v); if ( !rc ) - rc = setup_compat_l4(v); + { + if ( !is_pvh_domain(d) ) + rc = setup_compat_l4(v); + else + rc = hvm_set_mode(v, 4); + } + if ( rc ) goto undo_and_fail; } @@ -410,7 +415,7 @@ int switch_compat(struct domain *d) { free_compat_arg_xlat(v); - if ( !pagetable_is_null(v->arch.guest_table) ) + if ( !is_pvh_domain(d) && !pagetable_is_null(v->arch.guest_table) ) release_compat_l4(v); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index fd21962..a38c302 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2425,7 +2425,6 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( is_pvh_domain(d) ) { - v->arch.hvm_vcpu.hcall_64bit = 1; /* PVH 32bitfixme. */ /* This is for hvm_long_mode_enabled(v). */ v->arch.hvm_vcpu.guest_efer = EFER_LMA | EFER_LME; return 0; @@ -6823,6 +6822,29 @@ bool_t altp2m_vcpu_emulate_ve(struct vcpu *v) return 0; } +int hvm_set_mode(struct vcpu *v, int mode) +{ + + switch ( mode ) + { + case 4: + v->arch.hvm_vcpu.guest_efer &= ~(EFER_LMA | EFER_LME); + break; + case 8: + v->arch.hvm_vcpu.guest_efer |= (EFER_LMA | EFER_LME); + break; + default: + return -EOPNOTSUPP; + } + + hvm_update_guest_efer(v); + + if ( hvm_funcs.set_mode ) + return hvm_funcs.set_mode(v, mode); + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index a0a97e7..08f2078 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1160,7 +1160,7 @@ static int construct_vmcs(struct vcpu *v) __vmwrite(GUEST_FS_AR_BYTES, 0xc093); __vmwrite(GUEST_GS_AR_BYTES, 0xc093); if ( is_pvh_domain(d) ) - /* CS.L == 1, exec, read/write, accessed. PVH 32bitfixme. */ + /* CS.L == 1, exec, read/write, accessed. */ __vmwrite(GUEST_CS_AR_BYTES, 0xa09b); else __vmwrite(GUEST_CS_AR_BYTES, 0xc09b); /* exec/read, accessed */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2582cdd..bbec0e8 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1886,6 +1886,24 @@ static bool_t vmx_vcpu_emulate_ve(struct vcpu *v) return rc; } +static int vmx_set_mode(struct vcpu *v, int mode) +{ + unsigned long attr; + + if ( !is_pvh_vcpu(v) ) + return 0; + + ASSERT((mode == 4) || (mode == 8)); + + attr = (mode == 4) ? 0xc09b : 0xa09b; + + vmx_vmcs_enter(v); + __vmwrite(GUEST_CS_AR_BYTES, attr); + vmx_vmcs_exit(v); + + return 0; +} + static struct hvm_function_table __initdata vmx_function_table = { .name = "VMX", .cpu_up_prepare = vmx_cpu_up_prepare, @@ -1945,6 +1963,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .hypervisor_cpuid_leaf = vmx_hypervisor_cpuid_leaf, .enable_msr_exit_interception = vmx_enable_msr_exit_interception, .is_singlestep_supported = vmx_is_singlestep_supported, + .set_mode = vmx_set_mode, .altp2m_vcpu_update_p2m = vmx_vcpu_update_eptp, .altp2m_vcpu_update_vmfunc_ve = vmx_vcpu_update_vmfunc_ve, .altp2m_vcpu_emulate_ve = vmx_vcpu_emulate_ve, diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 68b216c..c21a768 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -206,6 +206,7 @@ struct hvm_function_table { void (*enable_msr_exit_interception)(struct domain *d); bool_t (*is_singlestep_supported)(void); + int (*set_mode)(struct vcpu *v, int mode); /* Alternate p2m */ void (*altp2m_vcpu_update_p2m)(struct vcpu *v); @@ -246,6 +247,7 @@ void hvm_set_guest_tsc_fixed(struct vcpu *v, u64 guest_tsc, u64 at_tsc); u64 hvm_get_guest_tsc_fixed(struct vcpu *v, u64 at_tsc); #define hvm_get_guest_tsc(v) hvm_get_guest_tsc_fixed(v, 0) +int hvm_set_mode(struct vcpu *v, int mode); void hvm_init_guest_time(struct domain *d); void hvm_set_guest_time(struct vcpu *v, u64 guest_time); u64 hvm_get_guest_time_fixed(struct vcpu *v, u64 at_tsc); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKud-0001l7-DA; Tue, 22 Sep 2015 10:35:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuc-0001kf-Fn for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:02 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id BB/DB-19220-5DE21065; Tue, 22 Sep 2015 10:35:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442918099!36851240!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19350 invoked from network); 22 Sep 2015 10:35:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuZ-0007c3-Pm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuZ-0002ur-Ey for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:34:59 +0000 Date: Tue, 22 Sep 2015 10:34:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: set 32b PVH guest mode in XEN_DOMCTL_set_address_size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad01afb7255af6755c44e34c943fc336bf4b0316 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:08:12 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:08:12 2015 +0200 x86/pvh: set 32b PVH guest mode in XEN_DOMCTL_set_address_size Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 27 ++++++++++++++++----------- xen/arch/x86/hvm/hvm.c | 24 +++++++++++++++++++++++- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 19 +++++++++++++++++++ xen/include/asm-x86/hvm/hvm.h | 2 ++ 5 files changed, 61 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 58e173e..a00ec97 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -366,7 +366,11 @@ int switch_native(struct domain *d) for_each_vcpu( d, v ) { free_compat_arg_xlat(v); - release_compat_l4(v); + + if ( !is_pvh_domain(d) ) + release_compat_l4(v); + else + hvm_set_mode(v, 8); } return 0; @@ -377,25 +381,26 @@ int switch_compat(struct domain *d) struct vcpu *v; int rc; - if ( is_pvh_domain(d) ) - { - printk(XENLOG_G_INFO - "Xen currently does not support 32bit PVH guests\n"); - return -EINVAL; - } - if ( !may_switch_mode(d) ) return -EACCES; if ( is_pv_32bit_domain(d) ) return 0; - d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 1; + d->arch.has_32bit_shinfo = 1; + if ( is_pv_domain(d) ) + d->arch.is_32bit_pv = 1; for_each_vcpu( d, v ) { rc = setup_compat_arg_xlat(v); if ( !rc ) - rc = setup_compat_l4(v); + { + if ( !is_pvh_domain(d) ) + rc = setup_compat_l4(v); + else + rc = hvm_set_mode(v, 4); + } + if ( rc ) goto undo_and_fail; } @@ -410,7 +415,7 @@ int switch_compat(struct domain *d) { free_compat_arg_xlat(v); - if ( !pagetable_is_null(v->arch.guest_table) ) + if ( !is_pvh_domain(d) && !pagetable_is_null(v->arch.guest_table) ) release_compat_l4(v); } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index fd21962..a38c302 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2425,7 +2425,6 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( is_pvh_domain(d) ) { - v->arch.hvm_vcpu.hcall_64bit = 1; /* PVH 32bitfixme. */ /* This is for hvm_long_mode_enabled(v). */ v->arch.hvm_vcpu.guest_efer = EFER_LMA | EFER_LME; return 0; @@ -6823,6 +6822,29 @@ bool_t altp2m_vcpu_emulate_ve(struct vcpu *v) return 0; } +int hvm_set_mode(struct vcpu *v, int mode) +{ + + switch ( mode ) + { + case 4: + v->arch.hvm_vcpu.guest_efer &= ~(EFER_LMA | EFER_LME); + break; + case 8: + v->arch.hvm_vcpu.guest_efer |= (EFER_LMA | EFER_LME); + break; + default: + return -EOPNOTSUPP; + } + + hvm_update_guest_efer(v); + + if ( hvm_funcs.set_mode ) + return hvm_funcs.set_mode(v, mode); + + return 0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index a0a97e7..08f2078 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1160,7 +1160,7 @@ static int construct_vmcs(struct vcpu *v) __vmwrite(GUEST_FS_AR_BYTES, 0xc093); __vmwrite(GUEST_GS_AR_BYTES, 0xc093); if ( is_pvh_domain(d) ) - /* CS.L == 1, exec, read/write, accessed. PVH 32bitfixme. */ + /* CS.L == 1, exec, read/write, accessed. */ __vmwrite(GUEST_CS_AR_BYTES, 0xa09b); else __vmwrite(GUEST_CS_AR_BYTES, 0xc09b); /* exec/read, accessed */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2582cdd..bbec0e8 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1886,6 +1886,24 @@ static bool_t vmx_vcpu_emulate_ve(struct vcpu *v) return rc; } +static int vmx_set_mode(struct vcpu *v, int mode) +{ + unsigned long attr; + + if ( !is_pvh_vcpu(v) ) + return 0; + + ASSERT((mode == 4) || (mode == 8)); + + attr = (mode == 4) ? 0xc09b : 0xa09b; + + vmx_vmcs_enter(v); + __vmwrite(GUEST_CS_AR_BYTES, attr); + vmx_vmcs_exit(v); + + return 0; +} + static struct hvm_function_table __initdata vmx_function_table = { .name = "VMX", .cpu_up_prepare = vmx_cpu_up_prepare, @@ -1945,6 +1963,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .hypervisor_cpuid_leaf = vmx_hypervisor_cpuid_leaf, .enable_msr_exit_interception = vmx_enable_msr_exit_interception, .is_singlestep_supported = vmx_is_singlestep_supported, + .set_mode = vmx_set_mode, .altp2m_vcpu_update_p2m = vmx_vcpu_update_eptp, .altp2m_vcpu_update_vmfunc_ve = vmx_vcpu_update_vmfunc_ve, .altp2m_vcpu_emulate_ve = vmx_vcpu_emulate_ve, diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 68b216c..c21a768 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -206,6 +206,7 @@ struct hvm_function_table { void (*enable_msr_exit_interception)(struct domain *d); bool_t (*is_singlestep_supported)(void); + int (*set_mode)(struct vcpu *v, int mode); /* Alternate p2m */ void (*altp2m_vcpu_update_p2m)(struct vcpu *v); @@ -246,6 +247,7 @@ void hvm_set_guest_tsc_fixed(struct vcpu *v, u64 guest_tsc, u64 at_tsc); u64 hvm_get_guest_tsc_fixed(struct vcpu *v, u64 at_tsc); #define hvm_get_guest_tsc(v) hvm_get_guest_tsc_fixed(v, 0) +int hvm_set_mode(struct vcpu *v, int mode); void hvm_init_guest_time(struct domain *d); void hvm_set_guest_time(struct vcpu *v, u64 guest_time); u64 hvm_get_guest_time_fixed(struct vcpu *v, u64 at_tsc); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKun-0001o5-IA; Tue, 22 Sep 2015 10:35:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKum-0001nc-8d for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:12 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 3C/43-06179-FDE21065; Tue, 22 Sep 2015 10:35:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1442918110!36885581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23350 invoked from network); 22 Sep 2015 10:35:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuj-0007ce-Ue for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuj-0002vb-Tg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:09 +0000 Date: Tue, 22 Sep 2015 10:35:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: do not allow 32-bit PVH guests to clear CR4's PAE bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 476cf36ac0de41bd5070f902c430d5ce90c7f590 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:08:56 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:08:56 2015 +0200 x86/pvh: do not allow 32-bit PVH guests to clear CR4's PAE bit .. since we only support 32-bit PV(H) guests in PAE mode. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a38c302..c6d2e59 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3522,11 +3522,19 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) goto gpf; } - if ( !(value & X86_CR4_PAE) && hvm_long_mode_enabled(v) ) + if ( !(value & X86_CR4_PAE) ) { - HVM_DBG_LOG(DBG_LEVEL_1, "Guest cleared CR4.PAE while " - "EFER.LMA is set"); - goto gpf; + if ( hvm_long_mode_enabled(v) ) + { + HVM_DBG_LOG(DBG_LEVEL_1, "Guest cleared CR4.PAE while " + "EFER.LMA is set"); + goto gpf; + } + if ( is_pvh_vcpu(v) ) + { + HVM_DBG_LOG(DBG_LEVEL_1, "32-bit PVH guest cleared CR4.PAE"); + goto gpf; + } } old_cr = v->arch.hvm_vcpu.guest_cr[4]; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKun-0001o5-IA; Tue, 22 Sep 2015 10:35:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKum-0001nc-8d for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:12 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 3C/43-06179-FDE21065; Tue, 22 Sep 2015 10:35:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1442918110!36885581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23350 invoked from network); 22 Sep 2015 10:35:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuj-0007ce-Ue for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuj-0002vb-Tg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:09 +0000 Date: Tue, 22 Sep 2015 10:35:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: do not allow 32-bit PVH guests to clear CR4's PAE bit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 476cf36ac0de41bd5070f902c430d5ce90c7f590 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:08:56 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:08:56 2015 +0200 x86/pvh: do not allow 32-bit PVH guests to clear CR4's PAE bit .. since we only support 32-bit PV(H) guests in PAE mode. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a38c302..c6d2e59 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3522,11 +3522,19 @@ int hvm_set_cr4(unsigned long value, bool_t may_defer) goto gpf; } - if ( !(value & X86_CR4_PAE) && hvm_long_mode_enabled(v) ) + if ( !(value & X86_CR4_PAE) ) { - HVM_DBG_LOG(DBG_LEVEL_1, "Guest cleared CR4.PAE while " - "EFER.LMA is set"); - goto gpf; + if ( hvm_long_mode_enabled(v) ) + { + HVM_DBG_LOG(DBG_LEVEL_1, "Guest cleared CR4.PAE while " + "EFER.LMA is set"); + goto gpf; + } + if ( is_pvh_vcpu(v) ) + { + HVM_DBG_LOG(DBG_LEVEL_1, "32-bit PVH guest cleared CR4.PAE"); + goto gpf; + } } old_cr = v->arch.hvm_vcpu.guest_cr[4]; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuy-0001qW-MX; Tue, 22 Sep 2015 10:35:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKux-0001q6-3O for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:23 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id B4/2A-26043-AEE21065; Tue, 22 Sep 2015 10:35:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1442918120!51911273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16972 invoked from network); 22 Sep 2015 10:35:21 -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; 22 Sep 2015 10:35:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuu-0007cm-4k for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuu-0002w9-2o for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:20 +0000 Date: Tue, 22 Sep 2015 10:35:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/compat: test both PV and PVH guests for compat 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 e264718e917708dd8d5080711e7cb97de91f00ae Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:09:34 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:09:34 2015 +0200 x86/compat: test both PV and PVH guests for compat mode Add is_pvh_32bit_domain() macro and use it alongside is_pv_32bit_domain() where necessary. Since PVH guests cannot change execution mode, has_32bit_shinfo is a good indicator of whether the guest is PVH and 32-bit. Signed-off-by: Boris Ostrovsky --- xen/arch/x86/domain.c | 6 +++--- xen/arch/x86/domctl.c | 5 +++-- xen/include/asm-x86/domain.h | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index a00ec97..7b73d47 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -358,7 +358,7 @@ int switch_native(struct domain *d) if ( !may_switch_mode(d) ) return -EACCES; - if ( !is_pv_32bit_domain(d) ) + if ( !is_pv_32bit_domain(d) && !is_pvh_32bit_domain(d) ) return 0; d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; @@ -383,7 +383,7 @@ int switch_compat(struct domain *d) if ( !may_switch_mode(d) ) return -EACCES; - if ( is_pv_32bit_domain(d) ) + if ( is_pv_32bit_domain(d) || is_pvh_32bit_domain(d) ) return 0; d->arch.has_32bit_shinfo = 1; @@ -771,7 +771,7 @@ int arch_set_info_guest( /* The context is a compat-mode one if the target domain is compat-mode; * we expect the tools to DTRT even in compat-mode callers. */ - compat = is_pv_32bit_domain(d); + compat = is_pv_32bit_domain(d) || is_pvh_32bit_domain(d); #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld)) flags = c(flags); diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index bf62a88..6172c0d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -349,7 +349,8 @@ long arch_do_domctl( case XEN_DOMCTL_get_address_size: domctl->u.address_size.size = - is_pv_32bit_domain(d) ? 32 : BITS_PER_LONG; + (is_pv_32bit_domain(d) || is_pvh_32bit_domain(d)) ? + 32 : BITS_PER_LONG; copyback = 1; break; @@ -1203,7 +1204,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) { unsigned int i; const struct domain *d = v->domain; - bool_t compat = is_pv_32bit_domain(d); + bool_t compat = is_pv_32bit_domain(d) || is_pvh_32bit_domain(d); #define c(fld) (!compat ? (c.nat->fld) : (c.cmp->fld)) if ( !is_pv_domain(d) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 680e2d8..59cf826 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -14,6 +14,7 @@ #define has_32bit_shinfo(d) ((d)->arch.has_32bit_shinfo) #define is_pv_32bit_domain(d) ((d)->arch.is_32bit_pv) #define is_pv_32bit_vcpu(v) (is_pv_32bit_domain((v)->domain)) +#define is_pvh_32bit_domain(d) (is_pvh_domain(d) && has_32bit_shinfo(d)) #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuy-0001qW-MX; Tue, 22 Sep 2015 10:35:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKux-0001q6-3O for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:23 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id B4/2A-26043-AEE21065; Tue, 22 Sep 2015 10:35:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1442918120!51911273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16972 invoked from network); 22 Sep 2015 10:35:21 -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; 22 Sep 2015 10:35:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKuu-0007cm-4k for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKuu-0002w9-2o for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:20 +0000 Date: Tue, 22 Sep 2015 10:35:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/compat: test both PV and PVH guests for compat 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 e264718e917708dd8d5080711e7cb97de91f00ae Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:09:34 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:09:34 2015 +0200 x86/compat: test both PV and PVH guests for compat mode Add is_pvh_32bit_domain() macro and use it alongside is_pv_32bit_domain() where necessary. Since PVH guests cannot change execution mode, has_32bit_shinfo is a good indicator of whether the guest is PVH and 32-bit. Signed-off-by: Boris Ostrovsky --- xen/arch/x86/domain.c | 6 +++--- xen/arch/x86/domctl.c | 5 +++-- xen/include/asm-x86/domain.h | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index a00ec97..7b73d47 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -358,7 +358,7 @@ int switch_native(struct domain *d) if ( !may_switch_mode(d) ) return -EACCES; - if ( !is_pv_32bit_domain(d) ) + if ( !is_pv_32bit_domain(d) && !is_pvh_32bit_domain(d) ) return 0; d->arch.is_32bit_pv = d->arch.has_32bit_shinfo = 0; @@ -383,7 +383,7 @@ int switch_compat(struct domain *d) if ( !may_switch_mode(d) ) return -EACCES; - if ( is_pv_32bit_domain(d) ) + if ( is_pv_32bit_domain(d) || is_pvh_32bit_domain(d) ) return 0; d->arch.has_32bit_shinfo = 1; @@ -771,7 +771,7 @@ int arch_set_info_guest( /* The context is a compat-mode one if the target domain is compat-mode; * we expect the tools to DTRT even in compat-mode callers. */ - compat = is_pv_32bit_domain(d); + compat = is_pv_32bit_domain(d) || is_pvh_32bit_domain(d); #define c(fld) (compat ? (c.cmp->fld) : (c.nat->fld)) flags = c(flags); diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index bf62a88..6172c0d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -349,7 +349,8 @@ long arch_do_domctl( case XEN_DOMCTL_get_address_size: domctl->u.address_size.size = - is_pv_32bit_domain(d) ? 32 : BITS_PER_LONG; + (is_pv_32bit_domain(d) || is_pvh_32bit_domain(d)) ? + 32 : BITS_PER_LONG; copyback = 1; break; @@ -1203,7 +1204,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) { unsigned int i; const struct domain *d = v->domain; - bool_t compat = is_pv_32bit_domain(d); + bool_t compat = is_pv_32bit_domain(d) || is_pvh_32bit_domain(d); #define c(fld) (!compat ? (c.nat->fld) : (c.cmp->fld)) if ( !is_pv_domain(d) ) diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 680e2d8..59cf826 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -14,6 +14,7 @@ #define has_32bit_shinfo(d) ((d)->arch.has_32bit_shinfo) #define is_pv_32bit_domain(d) ((d)->arch.is_32bit_pv) #define is_pv_32bit_vcpu(v) (is_pv_32bit_domain((v)->domain)) +#define is_pvh_32bit_domain(d) (is_pvh_domain(d) && has_32bit_shinfo(d)) #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKv8-0001t5-PG; Tue, 22 Sep 2015 10:35:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKv6-0001sY-UY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:33 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id FB/A6-06021-4FE21065; Tue, 22 Sep 2015 10:35:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1442918130!44081435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21457 invoked from network); 22 Sep 2015 10:35:31 -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; 22 Sep 2015 10:35:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKv4-0007cu-BD for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKv4-0002xZ-99 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:30 +0000 Date: Tue, 22 Sep 2015 10:35:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: handle hypercalls for 32b PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8149a99ed961c4414cdd9f15d66fe8db58e063cb Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:10:13 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:10:13 2015 +0200 x86/pvh: handle hypercalls for 32b PVH guests Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index c6d2e59..1ec6c41 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5111,7 +5111,6 @@ static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] = { [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; -/* PVH 32bitfixme. */ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { HYPERCALL(platform_op), HYPERCALL(memory_op), @@ -5131,6 +5130,30 @@ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; +extern int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(void) cmp_uops, + unsigned int count, + XEN_GUEST_HANDLE_PARAM(uint) pdone, + unsigned int foreigndom); +static hvm_hypercall_t *const pvh_hypercall32_table[NR_hypercalls] = { + HYPERCALL(platform_op), + COMPAT_CALL(memory_op), + HYPERCALL(xen_version), + HYPERCALL(console_io), + [ __HYPERVISOR_grant_table_op ] = + (hvm_hypercall_t *)hvm_grant_table_op_compat32, + COMPAT_CALL(vcpu_op), + COMPAT_CALL(mmuext_op), + HYPERCALL(xsm_op), + COMPAT_CALL(sched_op), + HYPERCALL(event_channel_op), + [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op_compat32, + HYPERCALL(hvm_op), + HYPERCALL(sysctl), + HYPERCALL(domctl), + HYPERCALL(xenpmu_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation +}; + extern const uint8_t hypercall_args_table[], compat_hypercall_args_table[]; int hvm_do_hypercall(struct cpu_user_regs *regs) @@ -5161,8 +5184,8 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) return viridian_hypercall(regs); if ( (eax >= NR_hypercalls) || - (is_pvh_domain(currd) ? !pvh_hypercall64_table[eax] - : !hvm_hypercall32_table[eax]) ) + !(is_pvh_domain(currd) ? pvh_hypercall32_table[eax] + : hvm_hypercall32_table[eax]) ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -5217,8 +5240,6 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif } - else if ( unlikely(is_pvh_domain(currd)) ) - regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ else { unsigned int ebx = regs->_ebx; @@ -5244,7 +5265,10 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif - regs->_eax = hvm_hypercall32_table[eax](ebx, ecx, edx, esi, edi, ebp); + regs->_eax = (is_pvh_vcpu(curr) + ? pvh_hypercall32_table + : hvm_hypercall32_table)[eax](ebx, ecx, edx, + esi, edi, ebp); #ifndef NDEBUG if ( !curr->arch.hvm_vcpu.hcall_preempted ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKv8-0001t5-PG; Tue, 22 Sep 2015 10:35:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKv6-0001sY-UY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:33 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id FB/A6-06021-4FE21065; Tue, 22 Sep 2015 10:35:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1442918130!44081435!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21457 invoked from network); 22 Sep 2015 10:35:31 -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; 22 Sep 2015 10:35:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKv4-0007cu-BD for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKv4-0002xZ-99 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:30 +0000 Date: Tue, 22 Sep 2015 10:35:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/pvh: handle hypercalls for 32b PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8149a99ed961c4414cdd9f15d66fe8db58e063cb Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:10:13 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:10:13 2015 +0200 x86/pvh: handle hypercalls for 32b PVH guests Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 36 ++++++++++++++++++++++++++++++------ 1 files changed, 30 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index c6d2e59..1ec6c41 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5111,7 +5111,6 @@ static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] = { [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; -/* PVH 32bitfixme. */ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { HYPERCALL(platform_op), HYPERCALL(memory_op), @@ -5131,6 +5130,30 @@ static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; +extern int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(void) cmp_uops, + unsigned int count, + XEN_GUEST_HANDLE_PARAM(uint) pdone, + unsigned int foreigndom); +static hvm_hypercall_t *const pvh_hypercall32_table[NR_hypercalls] = { + HYPERCALL(platform_op), + COMPAT_CALL(memory_op), + HYPERCALL(xen_version), + HYPERCALL(console_io), + [ __HYPERVISOR_grant_table_op ] = + (hvm_hypercall_t *)hvm_grant_table_op_compat32, + COMPAT_CALL(vcpu_op), + COMPAT_CALL(mmuext_op), + HYPERCALL(xsm_op), + COMPAT_CALL(sched_op), + HYPERCALL(event_channel_op), + [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op_compat32, + HYPERCALL(hvm_op), + HYPERCALL(sysctl), + HYPERCALL(domctl), + HYPERCALL(xenpmu_op), + [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation +}; + extern const uint8_t hypercall_args_table[], compat_hypercall_args_table[]; int hvm_do_hypercall(struct cpu_user_regs *regs) @@ -5161,8 +5184,8 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) return viridian_hypercall(regs); if ( (eax >= NR_hypercalls) || - (is_pvh_domain(currd) ? !pvh_hypercall64_table[eax] - : !hvm_hypercall32_table[eax]) ) + !(is_pvh_domain(currd) ? pvh_hypercall32_table[eax] + : hvm_hypercall32_table[eax]) ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -5217,8 +5240,6 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif } - else if ( unlikely(is_pvh_domain(currd)) ) - regs->_eax = -ENOSYS; /* PVH 32bitfixme. */ else { unsigned int ebx = regs->_ebx; @@ -5244,7 +5265,10 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif - regs->_eax = hvm_hypercall32_table[eax](ebx, ecx, edx, esi, edi, ebp); + regs->_eax = (is_pvh_vcpu(curr) + ? pvh_hypercall32_table + : hvm_hypercall32_table)[eax](ebx, ecx, edx, + esi, edi, ebp); #ifndef NDEBUG if ( !curr->arch.hvm_vcpu.hcall_preempted ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvI-0001vG-1D; Tue, 22 Sep 2015 10:35:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvG-0001uo-VY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:43 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 90/D3-32110-EFE21065; Tue, 22 Sep 2015 10:35:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1442918140!36842975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1036 invoked from network); 22 Sep 2015 10:35:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvE-0007d2-HF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvE-0002yA-Fk for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:40 +0000 Date: Tue, 22 Sep 2015 10:35:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/x86/pvh: Allow creation of 32b PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd5964a2a08addee1458659aacceeda48c4d44d9 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:10:39 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:10:39 2015 +0200 libxc/x86/pvh: Allow creation of 32b PVH guests Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_dom_x86.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 3d40fa4..05fb0ce 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -300,7 +300,8 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) pgpfn = (addr - dom->parms.virt_base) >> PAGE_SHIFT_X86; l1tab[l1off] = pfn_to_paddr(xc_dom_p2m_guest(dom, pgpfn)) | L1_PROT; - if ( (addr >= dom->pgtables_seg.vstart) && + if ( (!dom->pvh_enabled) && + (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ @@ -590,22 +591,9 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) DOMPRINTF_CALLED(dom->xch); - if ( dom->pvh_enabled ) - { - xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: PVH not supported for 32bit guests.", __FUNCTION__); - return -1; - } - /* clear everything */ memset(ctxt, 0, sizeof(*ctxt)); - ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.es = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_32; - ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_32; ctxt->user_regs.eip = dom->parms.virt_entry; ctxt->user_regs.esp = dom->parms.virt_base + (dom->bootstack_pfn + 1) * PAGE_SIZE_X86; @@ -613,9 +601,6 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) dom->parms.virt_base + (dom->start_info_pfn) * PAGE_SIZE_X86; ctxt->user_regs.eflags = 1 << 9; /* Interrupt Enable */ - ctxt->kernel_ss = ctxt->user_regs.ss; - ctxt->kernel_sp = ctxt->user_regs.esp; - ctxt->flags = VGCF_in_kernel_X86_32 | VGCF_online_X86_32; if ( dom->parms.pae == 2 /* extended_cr3 */ || dom->parms.pae == 3 /* bimodal */ ) @@ -626,6 +611,19 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) DOMPRINTF("%s: cr3: pfn 0x%" PRIpfn " mfn 0x%" PRIpfn "", __FUNCTION__, dom->pgtables_seg.pfn, cr3_pfn); + if ( dom->pvh_enabled ) + return 0; + + ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.es = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_32; + ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_32; + + ctxt->kernel_ss = ctxt->user_regs.ss; + ctxt->kernel_sp = ctxt->user_regs.esp; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvI-0001vG-1D; Tue, 22 Sep 2015 10:35:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvG-0001uo-VY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:43 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 90/D3-32110-EFE21065; Tue, 22 Sep 2015 10:35:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1442918140!36842975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1036 invoked from network); 22 Sep 2015 10:35:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvE-0007d2-HF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvE-0002yA-Fk for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:40 +0000 Date: Tue, 22 Sep 2015 10:35:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/x86/pvh: Allow creation of 32b PVH guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd5964a2a08addee1458659aacceeda48c4d44d9 Author: Boris Ostrovsky AuthorDate: Wed Sep 9 17:10:39 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 9 17:10:39 2015 +0200 libxc/x86/pvh: Allow creation of 32b PVH guests Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/libxc/xc_dom_x86.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 3d40fa4..05fb0ce 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -300,7 +300,8 @@ static int setup_pgtables_x86_32_pae(struct xc_dom_image *dom) pgpfn = (addr - dom->parms.virt_base) >> PAGE_SHIFT_X86; l1tab[l1off] = pfn_to_paddr(xc_dom_p2m_guest(dom, pgpfn)) | L1_PROT; - if ( (addr >= dom->pgtables_seg.vstart) && + if ( (!dom->pvh_enabled) && + (addr >= dom->pgtables_seg.vstart) && (addr < dom->pgtables_seg.vend) ) l1tab[l1off] &= ~_PAGE_RW; /* page tables are r/o */ @@ -590,22 +591,9 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) DOMPRINTF_CALLED(dom->xch); - if ( dom->pvh_enabled ) - { - xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "%s: PVH not supported for 32bit guests.", __FUNCTION__); - return -1; - } - /* clear everything */ memset(ctxt, 0, sizeof(*ctxt)); - ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.es = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_32; - ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_32; - ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_32; ctxt->user_regs.eip = dom->parms.virt_entry; ctxt->user_regs.esp = dom->parms.virt_base + (dom->bootstack_pfn + 1) * PAGE_SIZE_X86; @@ -613,9 +601,6 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) dom->parms.virt_base + (dom->start_info_pfn) * PAGE_SIZE_X86; ctxt->user_regs.eflags = 1 << 9; /* Interrupt Enable */ - ctxt->kernel_ss = ctxt->user_regs.ss; - ctxt->kernel_sp = ctxt->user_regs.esp; - ctxt->flags = VGCF_in_kernel_X86_32 | VGCF_online_X86_32; if ( dom->parms.pae == 2 /* extended_cr3 */ || dom->parms.pae == 3 /* bimodal */ ) @@ -626,6 +611,19 @@ static int vcpu_x86_32(struct xc_dom_image *dom, void *ptr) DOMPRINTF("%s: cr3: pfn 0x%" PRIpfn " mfn 0x%" PRIpfn "", __FUNCTION__, dom->pgtables_seg.pfn, cr3_pfn); + if ( dom->pvh_enabled ) + return 0; + + ctxt->user_regs.ds = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.es = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.fs = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.gs = FLAT_KERNEL_DS_X86_32; + ctxt->user_regs.ss = FLAT_KERNEL_SS_X86_32; + ctxt->user_regs.cs = FLAT_KERNEL_CS_X86_32; + + ctxt->kernel_ss = ctxt->user_regs.ss; + ctxt->kernel_sp = ctxt->user_regs.esp; + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvT-0001xw-3z; Tue, 22 Sep 2015 10:35:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvR-0001xZ-U0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:54 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D0/A1-16965-90F21065; Tue, 22 Sep 2015 10:35:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918150!46553318!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8964 invoked from network); 22 Sep 2015 10:35:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvO-0007dE-OF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvO-0002yl-Mg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:50 +0000 Date: Tue, 22 Sep 2015 10:35:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Rerun autogen.sh to pickup new version number X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1d95d0f87fb11323577d162bf3201eb86f8cca4 Author: Ian Campbell AuthorDate: Thu Sep 10 12:30:40 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:30:40 2015 +0100 Rerun autogen.sh to pickup new version number 315a8722b4d7ba6141c6cc85009b6e09f5b20424 bumped the version after 4.6 branched. This picks up that change into the generated files. Signed-off-by: Ian Campbell --- configure | 18 +++++++++--------- docs/configure | 18 +++++++++--------- stubdom/configure | 18 +++++++++--------- tools/configure | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 80b27d6..3c269fa 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.7. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1211,7 +1211,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1276,7 +1276,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor 4.7:";; esac cat <<\_ACEOF @@ -1366,7 +1366,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor configure 4.6 +Xen Hypervisor configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1383,7 +1383,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor $as_me 4.6, which was +It was created by Xen Hypervisor $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2747,7 +2747,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor $as_me 4.6, which was +This file was extended by Xen Hypervisor $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2801,7 +2801,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor config.status 4.6 +Xen Hypervisor config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/docs/configure b/docs/configure index fb1d96c..642c754 100755 --- a/docs/configure +++ b/docs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.7. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Documentation' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor Documentation 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor Documentation 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1186,7 +1186,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Documentation 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Documentation 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1247,7 +1247,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.7:";; esac cat <<\_ACEOF @@ -1327,7 +1327,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Documentation configure 4.6 +Xen Hypervisor Documentation configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1344,7 +1344,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Documentation $as_me 4.6, which was +It was created by Xen Hypervisor Documentation $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2628,7 +2628,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Documentation $as_me 4.6, which was +This file was extended by Xen Hypervisor Documentation $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2682,7 +2682,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Documentation config.status 4.6 +Xen Hypervisor Documentation config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/stubdom/configure b/stubdom/configure index f4b1cd3..5b9c609 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.7. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Stub Domains' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor Stub Domains 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor Stub Domains 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Stub Domains 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Stub Domains 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.7:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Stub Domains configure 4.6 +Xen Hypervisor Stub Domains configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Stub Domains $as_me 4.6, which was +It was created by Xen Hypervisor Stub Domains $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Stub Domains $as_me 4.6, which was +This file was extended by Xen Hypervisor Stub Domains $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4232,7 +4232,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Stub Domains config.status 4.6 +Xen Hypervisor Stub Domains config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/tools/configure b/tools/configure index 884ce0a..99677d1 100755 --- a/tools/configure +++ b/tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.7. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Tools' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor Tools 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor Tools 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1387,7 +1387,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Tools 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Tools 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1452,7 +1452,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.7:";; esac cat <<\_ACEOF @@ -1638,7 +1638,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Tools configure 4.6 +Xen Hypervisor Tools configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2053,7 +2053,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Tools $as_me 4.6, which was +It was created by Xen Hypervisor Tools $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9840,7 +9840,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Tools $as_me 4.6, which was +This file was extended by Xen Hypervisor Tools $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9903,7 +9903,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Tools config.status 4.6 +Xen Hypervisor Tools config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:35:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:35:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvT-0001xw-3z; Tue, 22 Sep 2015 10:35:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvR-0001xZ-U0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:54 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D0/A1-16965-90F21065; Tue, 22 Sep 2015 10:35:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918150!46553318!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8964 invoked from network); 22 Sep 2015 10:35:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:35:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvO-0007dE-OF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvO-0002yl-Mg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:35:50 +0000 Date: Tue, 22 Sep 2015 10:35:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Rerun autogen.sh to pickup new version number X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a1d95d0f87fb11323577d162bf3201eb86f8cca4 Author: Ian Campbell AuthorDate: Thu Sep 10 12:30:40 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:30:40 2015 +0100 Rerun autogen.sh to pickup new version number 315a8722b4d7ba6141c6cc85009b6e09f5b20424 bumped the version after 4.6 branched. This picks up that change into the generated files. Signed-off-by: Ian Campbell --- configure | 18 +++++++++--------- docs/configure | 18 +++++++++--------- stubdom/configure | 18 +++++++++--------- tools/configure | 18 +++++++++--------- 4 files changed, 36 insertions(+), 36 deletions(-) diff --git a/configure b/configure index 80b27d6..3c269fa 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor 4.7. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1211,7 +1211,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1276,7 +1276,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor 4.7:";; esac cat <<\_ACEOF @@ -1366,7 +1366,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor configure 4.6 +Xen Hypervisor configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1383,7 +1383,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor $as_me 4.6, which was +It was created by Xen Hypervisor $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2747,7 +2747,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor $as_me 4.6, which was +This file was extended by Xen Hypervisor $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2801,7 +2801,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor config.status 4.6 +Xen Hypervisor config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/docs/configure b/docs/configure index fb1d96c..642c754 100755 --- a/docs/configure +++ b/docs/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Documentation 4.7. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Documentation' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor Documentation 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor Documentation 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1186,7 +1186,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Documentation 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Documentation 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1247,7 +1247,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor Documentation 4.7:";; esac cat <<\_ACEOF @@ -1327,7 +1327,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Documentation configure 4.6 +Xen Hypervisor Documentation configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1344,7 +1344,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Documentation $as_me 4.6, which was +It was created by Xen Hypervisor Documentation $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2628,7 +2628,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Documentation $as_me 4.6, which was +This file was extended by Xen Hypervisor Documentation $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2682,7 +2682,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Documentation config.status 4.6 +Xen Hypervisor Documentation config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/stubdom/configure b/stubdom/configure index f4b1cd3..5b9c609 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Stub Domains 4.7. # # Report bugs to . # @@ -579,8 +579,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Stub Domains' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor Stub Domains 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor Stub Domains 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Stub Domains 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Stub Domains 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1315,7 +1315,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor Stub Domains 4.7:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Stub Domains configure 4.6 +Xen Hypervisor Stub Domains configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Stub Domains $as_me 4.6, which was +It was created by Xen Hypervisor Stub Domains $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4178,7 +4178,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Stub Domains $as_me 4.6, which was +This file was extended by Xen Hypervisor Stub Domains $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4232,7 +4232,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Stub Domains config.status 4.6 +Xen Hypervisor Stub Domains config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/tools/configure b/tools/configure index 884ce0a..99677d1 100755 --- a/tools/configure +++ b/tools/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.6. +# Generated by GNU Autoconf 2.69 for Xen Hypervisor Tools 4.7. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Xen Hypervisor Tools' PACKAGE_TARNAME='xen' -PACKAGE_VERSION='4.6' -PACKAGE_STRING='Xen Hypervisor Tools 4.6' +PACKAGE_VERSION='4.7' +PACKAGE_STRING='Xen Hypervisor Tools 4.7' PACKAGE_BUGREPORT='xen-devel@lists.xen.org' PACKAGE_URL='http://www.xen.org/' @@ -1387,7 +1387,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xen Hypervisor Tools 4.6 to adapt to many kinds of systems. +\`configure' configures Xen Hypervisor Tools 4.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1452,7 +1452,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.6:";; + short | recursive ) echo "Configuration of Xen Hypervisor Tools 4.7:";; esac cat <<\_ACEOF @@ -1638,7 +1638,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xen Hypervisor Tools configure 4.6 +Xen Hypervisor Tools configure 4.7 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2053,7 +2053,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xen Hypervisor Tools $as_me 4.6, which was +It was created by Xen Hypervisor Tools $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9840,7 +9840,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xen Hypervisor Tools $as_me 4.6, which was +This file was extended by Xen Hypervisor Tools $as_me 4.7, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9903,7 +9903,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xen Hypervisor Tools config.status 4.6 +Xen Hypervisor Tools config.status 4.7 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvc-00021L-LQ; Tue, 22 Sep 2015 10:36:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvb-00020n-In for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:03 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id BF/11-01753-21F21065; Tue, 22 Sep 2015 10:36:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442918161!46484052!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4632 invoked from network); 22 Sep 2015 10:36:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvY-0007dV-UP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvY-0002zP-Sg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:00 +0000 Date: Tue, 22 Sep 2015 10:36:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: don't silently disable systemd support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 250f988c6c41004bd46990edb9d5662bb606cf92 Author: Wei Liu AuthorDate: Thu Sep 10 12:18:03 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:23 2015 +0100 configure: don't silently disable systemd support Originally when user runs ./configure --enable-systemd and systemd development library is not available the build system silently disables systemd support. This is not in line with normal expectation. Instead, configure should error out when user has asked for systemd support but development libraries can't be found. Reported-by: George Dunlap Signed-off-by: Wei Liu Acked-by: Ian Campbell --- m4/systemd.m4 | 6 +++++- tools/configure | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 8284993..e4b1aa5 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -85,7 +85,11 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled]) systemd=y AX_CHECK_SYSTEMD_LIBS() - ],[systemd=n]) + ],[ + AS_IF([test "x$enable_systemd" = "xyes"], + [AC_MSG_ERROR([Unable to find systemd development library])], + [systemd=n]) + ]) ],[systemd=n]) ]) diff --git a/tools/configure b/tools/configure index 99677d1..41bed77 100755 --- a/tools/configure +++ b/tools/configure @@ -9318,9 +9318,15 @@ fi else + + if test "x$enable_systemd" = "xyes"; then : + as_fn_error $? "Unable to find systemd development library" "$LINENO" 5 +else systemd=n fi +fi + else systemd=n fi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvc-00021L-LQ; Tue, 22 Sep 2015 10:36:04 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvb-00020n-In for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:03 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id BF/11-01753-21F21065; Tue, 22 Sep 2015 10:36:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442918161!46484052!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4632 invoked from network); 22 Sep 2015 10:36:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvY-0007dV-UP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvY-0002zP-Sg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:00 +0000 Date: Tue, 22 Sep 2015 10:36:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: don't silently disable systemd support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 250f988c6c41004bd46990edb9d5662bb606cf92 Author: Wei Liu AuthorDate: Thu Sep 10 12:18:03 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:23 2015 +0100 configure: don't silently disable systemd support Originally when user runs ./configure --enable-systemd and systemd development library is not available the build system silently disables systemd support. This is not in line with normal expectation. Instead, configure should error out when user has asked for systemd support but development libraries can't be found. Reported-by: George Dunlap Signed-off-by: Wei Liu Acked-by: Ian Campbell --- m4/systemd.m4 | 6 +++++- tools/configure | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index 8284993..e4b1aa5 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -85,7 +85,11 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ AC_DEFINE([HAVE_SYSTEMD], [1], [Systemd available and enabled]) systemd=y AX_CHECK_SYSTEMD_LIBS() - ],[systemd=n]) + ],[ + AS_IF([test "x$enable_systemd" = "xyes"], + [AC_MSG_ERROR([Unable to find systemd development library])], + [systemd=n]) + ]) ],[systemd=n]) ]) diff --git a/tools/configure b/tools/configure index 99677d1..41bed77 100755 --- a/tools/configure +++ b/tools/configure @@ -9318,9 +9318,15 @@ fi else + + if test "x$enable_systemd" = "xyes"; then : + as_fn_error $? "Unable to find systemd development library" "$LINENO" 5 +else systemd=n fi +fi + else systemd=n fi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvm-00024P-OT; Tue, 22 Sep 2015 10:36:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvl-00023p-CW for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:13 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 47/EC-30270-C1F21065; Tue, 22 Sep 2015 10:36:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442918171!31581539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7663 invoked from network); 22 Sep 2015 10:36:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvj-0007eB-2v for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvj-00030G-1g for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:11 +0000 Date: Tue, 22 Sep 2015 10:36:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: set ret to non-zero value in failure path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63ac1c01f3c5a9afb2c4ef3e6c44eb973cfca7e9 Author: Wei Liu AuthorDate: Wed Sep 9 18:03:36 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:26 2015 +0100 libxl: set ret to non-zero value in failure path ... otherwise we have something like: xl: libxl_create.c:968: initiate_domain_create: Assertion `ret' failed. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5128160..29c2641 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -865,6 +865,7 @@ static void initiate_domain_create(libxl__egc *egc, */ if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && d_config->b_info.num_vnuma_nodes) { + ret = ERROR_INVAL; LOG(ERROR, "PV vNUMA is not yet supported"); goto error_out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvm-00024P-OT; Tue, 22 Sep 2015 10:36:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvl-00023p-CW for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:13 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 47/EC-30270-C1F21065; Tue, 22 Sep 2015 10:36:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442918171!31581539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7663 invoked from network); 22 Sep 2015 10:36:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvj-0007eB-2v for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvj-00030G-1g for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:11 +0000 Date: Tue, 22 Sep 2015 10:36:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: set ret to non-zero value in failure path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63ac1c01f3c5a9afb2c4ef3e6c44eb973cfca7e9 Author: Wei Liu AuthorDate: Wed Sep 9 18:03:36 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 10 12:31:26 2015 +0100 libxl: set ret to non-zero value in failure path ... otherwise we have something like: xl: libxl_create.c:968: initiate_domain_create: Assertion `ret' failed. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5128160..29c2641 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -865,6 +865,7 @@ static void initiate_domain_create(libxl__egc *egc, */ if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV && d_config->b_info.num_vnuma_nodes) { + ret = ERROR_INVAL; LOG(ERROR, "PV vNUMA is not yet supported"); goto error_out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36: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 1ZeKvx-000276-RD; Tue, 22 Sep 2015 10:36:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvw-00026h-L4 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:24 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 79/FB-03763-72F21065; Tue, 22 Sep 2015 10:36:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918181!46553559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22474 invoked from network); 22 Sep 2015 10:36:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvt-0007eJ-8Z for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvt-000315-6v for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:21 +0000 Date: Tue, 22 Sep 2015 10:36:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce SHUTDOWN_soft_reset shutdown reason X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40a57f232e782a49da0b4b1dc9a34d6a5b613009 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:51:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:51:26 2015 +0200 introduce SHUTDOWN_soft_reset shutdown reason This special type of shutdown is supposed to be used by PVHVM guests when they want to perform some sort of kexec/kdump. Signed-off-by: Vitaly Kuznetsov Acked-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk --- xen/common/shutdown.c | 6 ++++++ xen/include/public/sched.h | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 9cfbf7a..03a8641 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -66,6 +66,12 @@ void hwdom_shutdown(u8 reason) machine_restart(0); break; /* not reached */ + case SHUTDOWN_soft_reset: + printk("Hardware domain %d did unsupported soft reset, rebooting.\n", + hardware_domain->domain_id); + machine_restart(0); + break; /* not reached */ + default: printk("Hardware Dom%u shutdown (unknown reason %u): ", hardware_domain->domain_id, reason); diff --git a/xen/include/public/sched.h b/xen/include/public/sched.h index 4000ac9..2219696 100644 --- a/xen/include/public/sched.h +++ b/xen/include/public/sched.h @@ -159,7 +159,16 @@ DEFINE_XEN_GUEST_HANDLE(sched_watchdog_t); #define SHUTDOWN_suspend 2 /* Clean up, save suspend info, kill. */ #define SHUTDOWN_crash 3 /* Tell controller we've crashed. */ #define SHUTDOWN_watchdog 4 /* Restart because watchdog time expired. */ -#define SHUTDOWN_MAX 4 /* Maximum valid shutdown reason. */ + +/* + * Domain asked to perform 'soft reset' for it. The expected behavior is to + * reset internal Xen state for the domain returning it to the point where it + * was created but leaving the domain's memory contents and vCPU contexts + * intact. This will allow the domain to start over and set up all Xen specific + * interfaces again. + */ +#define SHUTDOWN_soft_reset 5 +#define SHUTDOWN_MAX 5 /* Maximum valid shutdown reason. */ /* ` } */ #endif /* __XEN_PUBLIC_SCHED_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36: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 1ZeKvx-000276-RD; Tue, 22 Sep 2015 10:36:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvw-00026h-L4 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:24 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 79/FB-03763-72F21065; Tue, 22 Sep 2015 10:36:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918181!46553559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22474 invoked from network); 22 Sep 2015 10:36:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKvt-0007eJ-8Z for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKvt-000315-6v for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:21 +0000 Date: Tue, 22 Sep 2015 10:36:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce SHUTDOWN_soft_reset shutdown reason X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40a57f232e782a49da0b4b1dc9a34d6a5b613009 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:51:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:51:26 2015 +0200 introduce SHUTDOWN_soft_reset shutdown reason This special type of shutdown is supposed to be used by PVHVM guests when they want to perform some sort of kexec/kdump. Signed-off-by: Vitaly Kuznetsov Acked-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk --- xen/common/shutdown.c | 6 ++++++ xen/include/public/sched.h | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c index 9cfbf7a..03a8641 100644 --- a/xen/common/shutdown.c +++ b/xen/common/shutdown.c @@ -66,6 +66,12 @@ void hwdom_shutdown(u8 reason) machine_restart(0); break; /* not reached */ + case SHUTDOWN_soft_reset: + printk("Hardware domain %d did unsupported soft reset, rebooting.\n", + hardware_domain->domain_id); + machine_restart(0); + break; /* not reached */ + default: printk("Hardware Dom%u shutdown (unknown reason %u): ", hardware_domain->domain_id, reason); diff --git a/xen/include/public/sched.h b/xen/include/public/sched.h index 4000ac9..2219696 100644 --- a/xen/include/public/sched.h +++ b/xen/include/public/sched.h @@ -159,7 +159,16 @@ DEFINE_XEN_GUEST_HANDLE(sched_watchdog_t); #define SHUTDOWN_suspend 2 /* Clean up, save suspend info, kill. */ #define SHUTDOWN_crash 3 /* Tell controller we've crashed. */ #define SHUTDOWN_watchdog 4 /* Restart because watchdog time expired. */ -#define SHUTDOWN_MAX 4 /* Maximum valid shutdown reason. */ + +/* + * Domain asked to perform 'soft reset' for it. The expected behavior is to + * reset internal Xen state for the domain returning it to the point where it + * was created but leaving the domain's memory contents and vCPU contexts + * intact. This will allow the domain to start over and set up all Xen specific + * interfaces again. + */ +#define SHUTDOWN_soft_reset 5 +#define SHUTDOWN_MAX 5 /* Maximum valid shutdown reason. */ /* ` } */ #endif /* __XEN_PUBLIC_SCHED_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKw6-0002CR-Tt; Tue, 22 Sep 2015 10:36:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKw6-0002Bz-2s for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:34 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 4E/17-06179-13F21065; Tue, 22 Sep 2015 10:36:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442918191!36851791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1708 invoked from network); 22 Sep 2015 10:36:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKw3-0007eR-F7 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKw3-000329-DP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:31 +0000 Date: Tue, 22 Sep 2015 10:36:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: support SHUTDOWN_soft_reset shutdown reason X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 961a86ba98bd95fe9961366da5202acba46068d8 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:52:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:52:08 2015 +0200 libxl: support SHUTDOWN_soft_reset shutdown reason Use letter 'S' to indicate a domain in such state. Introduce new 'on_soft_reset' action and default it to 'restart' for now. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu --- docs/man/xl.cfg.pod.5 | 5 +++++ tools/libxl/libxl_types.idl | 2 ++ tools/libxl/xl_cmdimpl.c | 12 +++++++++++- tools/python/xen/lowlevel/xl/xl.c | 1 + 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 80e51bb..c6345b8 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -367,6 +367,11 @@ Default is C. Action to take if the domain crashes. Default is C. +=item B + +Action to take if the domain performs 'soft reset' (e.g. does kexec). +Default is C. + =back =head3 Direct Kernel Boot diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ef346e7..9f6ec00 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -192,6 +192,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ (2, "suspend"), (3, "crash"), (4, "watchdog"), + (5, "soft_reset"), ], init_val = "LIBXL_SHUTDOWN_REASON_UNKNOWN") libxl_vga_interface_type = Enumeration("vga_interface_type", [ @@ -637,6 +638,7 @@ libxl_domain_config = Struct("domain_config", [ ("on_reboot", libxl_action_on_shutdown), ("on_watchdog", libxl_action_on_shutdown), ("on_crash", libxl_action_on_shutdown), + ("on_soft_reset", libxl_action_on_shutdown), ], dir=DIR_IN) libxl_diskinfo = Struct("diskinfo", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ebbb9a5..6fdc874 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1419,6 +1419,13 @@ static void parse_config_data(const char *config_source, exit(1); } + if (xlu_cfg_get_string (config, "on_soft_reset", &buf, 0)) + buf = "restart"; + if (!parse_action_on_shutdown(buf, &d_config->on_soft_reset)) { + fprintf(stderr, "Unknown on_soft_reset action \"%s\" specified\n", buf); + exit(1); + } + /* libxl_get_required_shadow_memory() must be called after final values * (default or specified) for vcpus and memory are set, because the * calculation depends on those values. */ @@ -2431,6 +2438,9 @@ static int handle_domain_death(uint32_t *r_domid, case LIBXL_SHUTDOWN_REASON_WATCHDOG: action = d_config->on_watchdog; break; + case LIBXL_SHUTDOWN_REASON_SOFT_RESET: + action = d_config->on_soft_reset; + break; default: LOG("Unknown shutdown reason code %d. Destroying domain.", event->u.domain_shutdown.shutdown_reason); @@ -3860,7 +3870,7 @@ static void list_domains(bool verbose, bool context, bool claim, bool numa, bool cpupool, const libxl_dominfo *info, int nb_domain) { int i; - static const char shutdown_reason_letters[]= "-rscw"; + static const char shutdown_reason_letters[]= "-rscwS"; libxl_bitmap nodemap; libxl_physinfo physinfo; diff --git a/tools/python/xen/lowlevel/xl/xl.c b/tools/python/xen/lowlevel/xl/xl.c index 20423a3..9b33731 100644 --- a/tools/python/xen/lowlevel/xl/xl.c +++ b/tools/python/xen/lowlevel/xl/xl.c @@ -783,6 +783,7 @@ PyMODINIT_FUNC initxl(void) _INT_CONST_LIBXL(m, SHUTDOWN_REASON_SUSPEND); _INT_CONST_LIBXL(m, SHUTDOWN_REASON_CRASH); _INT_CONST_LIBXL(m, SHUTDOWN_REASON_WATCHDOG); + _INT_CONST_LIBXL(m, SHUTDOWN_REASON_SOFT_RESET); genwrap__init(m); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKw6-0002CR-Tt; Tue, 22 Sep 2015 10:36:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKw6-0002Bz-2s for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:34 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 4E/17-06179-13F21065; Tue, 22 Sep 2015 10:36:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442918191!36851791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1708 invoked from network); 22 Sep 2015 10:36:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKw3-0007eR-F7 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKw3-000329-DP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:31 +0000 Date: Tue, 22 Sep 2015 10:36:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: support SHUTDOWN_soft_reset shutdown reason X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 961a86ba98bd95fe9961366da5202acba46068d8 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:52:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:52:08 2015 +0200 libxl: support SHUTDOWN_soft_reset shutdown reason Use letter 'S' to indicate a domain in such state. Introduce new 'on_soft_reset' action and default it to 'restart' for now. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu --- docs/man/xl.cfg.pod.5 | 5 +++++ tools/libxl/libxl_types.idl | 2 ++ tools/libxl/xl_cmdimpl.c | 12 +++++++++++- tools/python/xen/lowlevel/xl/xl.c | 1 + 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 80e51bb..c6345b8 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -367,6 +367,11 @@ Default is C. Action to take if the domain crashes. Default is C. +=item B + +Action to take if the domain performs 'soft reset' (e.g. does kexec). +Default is C. + =back =head3 Direct Kernel Boot diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index ef346e7..9f6ec00 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -192,6 +192,7 @@ libxl_shutdown_reason = Enumeration("shutdown_reason", [ (2, "suspend"), (3, "crash"), (4, "watchdog"), + (5, "soft_reset"), ], init_val = "LIBXL_SHUTDOWN_REASON_UNKNOWN") libxl_vga_interface_type = Enumeration("vga_interface_type", [ @@ -637,6 +638,7 @@ libxl_domain_config = Struct("domain_config", [ ("on_reboot", libxl_action_on_shutdown), ("on_watchdog", libxl_action_on_shutdown), ("on_crash", libxl_action_on_shutdown), + ("on_soft_reset", libxl_action_on_shutdown), ], dir=DIR_IN) libxl_diskinfo = Struct("diskinfo", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index ebbb9a5..6fdc874 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1419,6 +1419,13 @@ static void parse_config_data(const char *config_source, exit(1); } + if (xlu_cfg_get_string (config, "on_soft_reset", &buf, 0)) + buf = "restart"; + if (!parse_action_on_shutdown(buf, &d_config->on_soft_reset)) { + fprintf(stderr, "Unknown on_soft_reset action \"%s\" specified\n", buf); + exit(1); + } + /* libxl_get_required_shadow_memory() must be called after final values * (default or specified) for vcpus and memory are set, because the * calculation depends on those values. */ @@ -2431,6 +2438,9 @@ static int handle_domain_death(uint32_t *r_domid, case LIBXL_SHUTDOWN_REASON_WATCHDOG: action = d_config->on_watchdog; break; + case LIBXL_SHUTDOWN_REASON_SOFT_RESET: + action = d_config->on_soft_reset; + break; default: LOG("Unknown shutdown reason code %d. Destroying domain.", event->u.domain_shutdown.shutdown_reason); @@ -3860,7 +3870,7 @@ static void list_domains(bool verbose, bool context, bool claim, bool numa, bool cpupool, const libxl_dominfo *info, int nb_domain) { int i; - static const char shutdown_reason_letters[]= "-rscw"; + static const char shutdown_reason_letters[]= "-rscwS"; libxl_bitmap nodemap; libxl_physinfo physinfo; diff --git a/tools/python/xen/lowlevel/xl/xl.c b/tools/python/xen/lowlevel/xl/xl.c index 20423a3..9b33731 100644 --- a/tools/python/xen/lowlevel/xl/xl.c +++ b/tools/python/xen/lowlevel/xl/xl.c @@ -783,6 +783,7 @@ PyMODINIT_FUNC initxl(void) _INT_CONST_LIBXL(m, SHUTDOWN_REASON_SUSPEND); _INT_CONST_LIBXL(m, SHUTDOWN_REASON_CRASH); _INT_CONST_LIBXL(m, SHUTDOWN_REASON_WATCHDOG); + _INT_CONST_LIBXL(m, SHUTDOWN_REASON_SOFT_RESET); genwrap__init(m); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwH-0002Si-0Q; Tue, 22 Sep 2015 10:36:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwG-0002SM-0N for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:44 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 1F/5A-09570-B3F21065; Tue, 22 Sep 2015 10:36:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1442918201!14522270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7813 invoked from network); 22 Sep 2015 10:36:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwD-0007ee-KR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwD-00032o-JT for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:41 +0000 Date: Tue, 22 Sep 2015 10:36:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: introduce enum domain_restart_type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5aefb9003175353de51ca441fd54b53bc2463302 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:52:58 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:52:58 2015 +0200 xl: introduce enum domain_restart_type As a preparation before adding new restart type (soft reset) put all restart types into an enum. Signed-off-by: Vitaly Kuznetsov Acked-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk --- tools/libxl/xl.h | 6 ++++++ tools/libxl/xl_cmdimpl.c | 23 ++++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 13bccba..6c19c0d 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -190,6 +190,12 @@ enum output_format { }; extern enum output_format default_output_format; +typedef enum { + DOMAIN_RESTART_NONE = 0, /* No domain restart */ + DOMAIN_RESTART_NORMAL, /* Domain should be restarted */ + DOMAIN_RESTART_RENAME, /* Domain should be renamed and restarted */ +} domain_restart_type; + extern void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh); #define XL_GLOBAL_CONFIG XEN_CONFIG_DIR "/xl.conf" diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6fdc874..c9bd839 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2411,15 +2411,12 @@ static void reload_domain_config(uint32_t domid, } } -/* Returns 1 if domain should be restarted, - * 2 if domain should be renamed then restarted, or 0 - * Can update r_domid if domain is destroyed etc */ -static int handle_domain_death(uint32_t *r_domid, - libxl_event *event, - libxl_domain_config *d_config) - +/* Can update r_domid if domain is destroyed */ +static domain_restart_type handle_domain_death(uint32_t *r_domid, + libxl_event *event, + libxl_domain_config *d_config) { - int restart = 0; + domain_restart_type restart = DOMAIN_RESTART_NONE; libxl_action_on_shutdown action; switch (event->u.domain_shutdown.shutdown_reason) { @@ -2474,12 +2471,12 @@ static int handle_domain_death(uint32_t *r_domid, case LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME: reload_domain_config(*r_domid, d_config); - restart = 2; + restart = DOMAIN_RESTART_RENAME; break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART: reload_domain_config(*r_domid, d_config); - restart = 1; + restart = DOMAIN_RESTART_NORMAL; /* fall-through */ case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: LOG("Domain %d needs to be cleaned up: destroying the domain", @@ -2946,7 +2943,7 @@ start: event->u.domain_shutdown.shutdown_reason, event->u.domain_shutdown.shutdown_reason); switch (handle_domain_death(&domid, event, &d_config)) { - case 2: + case DOMAIN_RESTART_RENAME: if (!preserve_domain(&domid, event, &d_config)) { /* If we fail then exit leaving the old domain in place. */ ret = -1; @@ -2954,7 +2951,7 @@ start: } /* Otherwise fall through and restart. */ - case 1: + case DOMAIN_RESTART_NORMAL: libxl_event_free(ctx, event); libxl_evdisable_domain_death(ctx, deathw); deathw = NULL; @@ -2990,7 +2987,7 @@ start: sleep(2); goto start; - case 0: + case DOMAIN_RESTART_NONE: LOG("Done. Exiting now"); libxl_event_free(ctx, event); ret = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwH-0002Si-0Q; Tue, 22 Sep 2015 10:36:45 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwG-0002SM-0N for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:44 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 1F/5A-09570-B3F21065; Tue, 22 Sep 2015 10:36:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1442918201!14522270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7813 invoked from network); 22 Sep 2015 10:36:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwD-0007ee-KR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwD-00032o-JT for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:41 +0000 Date: Tue, 22 Sep 2015 10:36:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: introduce enum domain_restart_type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5aefb9003175353de51ca441fd54b53bc2463302 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:52:58 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:52:58 2015 +0200 xl: introduce enum domain_restart_type As a preparation before adding new restart type (soft reset) put all restart types into an enum. Signed-off-by: Vitaly Kuznetsov Acked-by: Ian Campbell Reviewed-by: Konrad Rzeszutek Wilk --- tools/libxl/xl.h | 6 ++++++ tools/libxl/xl_cmdimpl.c | 23 ++++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 13bccba..6c19c0d 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -190,6 +190,12 @@ enum output_format { }; extern enum output_format default_output_format; +typedef enum { + DOMAIN_RESTART_NONE = 0, /* No domain restart */ + DOMAIN_RESTART_NORMAL, /* Domain should be restarted */ + DOMAIN_RESTART_RENAME, /* Domain should be renamed and restarted */ +} domain_restart_type; + extern void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh); #define XL_GLOBAL_CONFIG XEN_CONFIG_DIR "/xl.conf" diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 6fdc874..c9bd839 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2411,15 +2411,12 @@ static void reload_domain_config(uint32_t domid, } } -/* Returns 1 if domain should be restarted, - * 2 if domain should be renamed then restarted, or 0 - * Can update r_domid if domain is destroyed etc */ -static int handle_domain_death(uint32_t *r_domid, - libxl_event *event, - libxl_domain_config *d_config) - +/* Can update r_domid if domain is destroyed */ +static domain_restart_type handle_domain_death(uint32_t *r_domid, + libxl_event *event, + libxl_domain_config *d_config) { - int restart = 0; + domain_restart_type restart = DOMAIN_RESTART_NONE; libxl_action_on_shutdown action; switch (event->u.domain_shutdown.shutdown_reason) { @@ -2474,12 +2471,12 @@ static int handle_domain_death(uint32_t *r_domid, case LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME: reload_domain_config(*r_domid, d_config); - restart = 2; + restart = DOMAIN_RESTART_RENAME; break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART: reload_domain_config(*r_domid, d_config); - restart = 1; + restart = DOMAIN_RESTART_NORMAL; /* fall-through */ case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: LOG("Domain %d needs to be cleaned up: destroying the domain", @@ -2946,7 +2943,7 @@ start: event->u.domain_shutdown.shutdown_reason, event->u.domain_shutdown.shutdown_reason); switch (handle_domain_death(&domid, event, &d_config)) { - case 2: + case DOMAIN_RESTART_RENAME: if (!preserve_domain(&domid, event, &d_config)) { /* If we fail then exit leaving the old domain in place. */ ret = -1; @@ -2954,7 +2951,7 @@ start: } /* Otherwise fall through and restart. */ - case 1: + case DOMAIN_RESTART_NORMAL: libxl_event_free(ctx, event); libxl_evdisable_domain_death(ctx, deathw); deathw = NULL; @@ -2990,7 +2987,7 @@ start: sleep(2); goto start; - case 0: + case DOMAIN_RESTART_NONE: LOG("Done. Exiting now"); libxl_event_free(ctx, event); ret = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwR-0002V5-3H; Tue, 22 Sep 2015 10:36:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwQ-0002Ul-55 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:54 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id CE/54-10678-54F21065; Tue, 22 Sep 2015 10:36:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918211!46553753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29896 invoked from network); 22 Sep 2015 10:36:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwN-0007em-Pi for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwN-00033M-Om for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:51 +0000 Date: Tue, 22 Sep 2015 10:36:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: make evtchn_reset() ready for soft reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 546d558a7a3b7024638210f45b07fa340a5f109d Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:53:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:53:08 2015 +0200 evtchn: make evtchn_reset() ready for soft reset We need to close all event channel so the domain performing soft reset will be able to open them back. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- xen/common/event_channel.c | 43 +++++++++++++++++++------------------------ xen/include/xen/event.h | 3 +++ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 46737cf..bd334f9 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -980,44 +980,28 @@ int evtchn_unmask(unsigned int port) } -static long evtchn_reset(evtchn_reset_t *r) +int evtchn_reset(struct domain *d) { - domid_t dom = r->dom; - struct domain *d; - int i, rc; - - d = rcu_lock_domain_by_any_id(dom); - if ( d == NULL ) - return -ESRCH; + unsigned int i; - rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d); - if ( rc ) - goto out; + if ( d != current->domain && !d->controller_pause_count ) + return -EINVAL; for ( i = 0; port_is_valid(d, i); i++ ) evtchn_close(d, i, 1); spin_lock(&d->event_lock); - if ( (dom == DOMID_SELF) && d->evtchn_fifo ) + if ( d->evtchn_fifo ) { - /* - * Guest domain called EVTCHNOP_reset with DOMID_SELF, destroying - * FIFO event array and control blocks, resetting evtchn_port_ops to - * evtchn_port_ops_2l. - */ + /* Switching back to 2-level ABI. */ evtchn_fifo_destroy(d); evtchn_2l_init(d); } spin_unlock(&d->event_lock); - rc = 0; - -out: - rcu_unlock_domain(d); - - return rc; + return 0; } static long evtchn_set_priority(const struct evtchn_set_priority *set_priority) @@ -1142,9 +1126,20 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case EVTCHNOP_reset: { struct evtchn_reset reset; + struct domain *d; + if ( copy_from_guest(&reset, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_reset(&reset); + + d = rcu_lock_domain_by_any_id(reset.dom); + if ( d == NULL ) + return -ESRCH; + + rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d); + if ( !rc ) + rc = evtchn_reset(d); + + rcu_unlock_domain(d); break; } diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index af923d1..b87924a 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -126,6 +126,9 @@ void evtchn_check_pollers(struct domain *d, unsigned int port); void evtchn_2l_init(struct domain *d); +/* Close all event channels and reset to 2-level ABI. */ +int evtchn_reset(struct domain *d); + /* * Low-level event channel port ops. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:36:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:36:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwR-0002V5-3H; Tue, 22 Sep 2015 10:36:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwQ-0002Ul-55 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:54 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id CE/54-10678-54F21065; Tue, 22 Sep 2015 10:36:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918211!46553753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29896 invoked from network); 22 Sep 2015 10:36:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:36:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwN-0007em-Pi for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwN-00033M-Om for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:36:51 +0000 Date: Tue, 22 Sep 2015 10:36:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: make evtchn_reset() ready for soft reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 546d558a7a3b7024638210f45b07fa340a5f109d Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:53:08 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:53:08 2015 +0200 evtchn: make evtchn_reset() ready for soft reset We need to close all event channel so the domain performing soft reset will be able to open them back. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- xen/common/event_channel.c | 43 +++++++++++++++++++------------------------ xen/include/xen/event.h | 3 +++ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 46737cf..bd334f9 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -980,44 +980,28 @@ int evtchn_unmask(unsigned int port) } -static long evtchn_reset(evtchn_reset_t *r) +int evtchn_reset(struct domain *d) { - domid_t dom = r->dom; - struct domain *d; - int i, rc; - - d = rcu_lock_domain_by_any_id(dom); - if ( d == NULL ) - return -ESRCH; + unsigned int i; - rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d); - if ( rc ) - goto out; + if ( d != current->domain && !d->controller_pause_count ) + return -EINVAL; for ( i = 0; port_is_valid(d, i); i++ ) evtchn_close(d, i, 1); spin_lock(&d->event_lock); - if ( (dom == DOMID_SELF) && d->evtchn_fifo ) + if ( d->evtchn_fifo ) { - /* - * Guest domain called EVTCHNOP_reset with DOMID_SELF, destroying - * FIFO event array and control blocks, resetting evtchn_port_ops to - * evtchn_port_ops_2l. - */ + /* Switching back to 2-level ABI. */ evtchn_fifo_destroy(d); evtchn_2l_init(d); } spin_unlock(&d->event_lock); - rc = 0; - -out: - rcu_unlock_domain(d); - - return rc; + return 0; } static long evtchn_set_priority(const struct evtchn_set_priority *set_priority) @@ -1142,9 +1126,20 @@ long do_event_channel_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case EVTCHNOP_reset: { struct evtchn_reset reset; + struct domain *d; + if ( copy_from_guest(&reset, arg, 1) != 0 ) return -EFAULT; - rc = evtchn_reset(&reset); + + d = rcu_lock_domain_by_any_id(reset.dom); + if ( d == NULL ) + return -ESRCH; + + rc = xsm_evtchn_reset(XSM_TARGET, current->domain, d); + if ( !rc ) + rc = evtchn_reset(d); + + rcu_unlock_domain(d); break; } diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index af923d1..b87924a 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -126,6 +126,9 @@ void evtchn_check_pollers(struct domain *d, unsigned int port); void evtchn_2l_init(struct domain *d); +/* Close all event channels and reset to 2-level ABI. */ +int evtchn_reset(struct domain *d); + /* * Low-level event channel port ops. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwb-0002XD-5n; Tue, 22 Sep 2015 10:37:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwa-0002X1-D6 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:04 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 41/44-12371-F4F21065; Tue, 22 Sep 2015 10:37:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1442918222!51915973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24524 invoked from network); 22 Sep 2015 10:37:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwX-0007fM-W6 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwX-00034C-Tm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:01 +0000 Date: Tue, 22 Sep 2015 10:37:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] grant_table: implement grant_table_warn_active_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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 502a592704ca782ba4fde0746464b68c52e6de7e Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:53:36 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:53:36 2015 +0200 grant_table: implement grant_table_warn_active_grants() Log first 10 active grants for a domain. This function is going to be used for soft reset, active grants on this path usually mean misbehaving backends refusing to release their mappings on shutdown. We need that in addition to the already existent 'g' keyhandler as such misbehaving backends can cause a domain to crash right after the soft reset operation and 'g' option won't be available in this case. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- xen/common/grant_table.c | 35 +++++++++++++++++++++++++++++++++++ xen/include/xen/grant_table.h | 5 +++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 2b449d5..23185e7 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3352,6 +3352,41 @@ gnttab_release_mappings( } } +void grant_table_warn_active_grants(struct domain *d) +{ + struct grant_table *gt = d->grant_table; + struct active_grant_entry *act; + grant_ref_t ref; + unsigned int nr_active = 0; + +#define WARN_GRANT_MAX 10 + + read_lock(>->lock); + + for ( ref = 0; ref != nr_grant_entries(gt); ref++ ) + { + act = active_entry_acquire(gt, ref); + if ( !act->pin ) + { + active_entry_release(act); + continue; + } + + nr_active++; + if ( nr_active <= WARN_GRANT_MAX ) + printk(XENLOG_G_DEBUG "Dom%d has an active grant: GFN: %lx (MFN: %lx)\n", + d->domain_id, act->gfn, act->frame); + active_entry_release(act); + } + + if ( nr_active > WARN_GRANT_MAX ) + printk(XENLOG_G_DEBUG "Dom%d has too many (%d) active grants to report\n", + d->domain_id, nr_active); + + read_unlock(>->lock); + +#undef WARN_GRANT_MAX +} void grant_table_destroy( diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 5263fd6..1c29cee 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -89,6 +89,11 @@ void grant_table_destroy( struct domain *d); void grant_table_init_vcpu(struct vcpu *v); +/* + * Check if domain has active grants and log first 10 of them. + */ +void grant_table_warn_active_grants(struct domain *d); + /* Domain death release of granted mappings of other domains' memory. */ void gnttab_release_mappings( -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwb-0002XD-5n; Tue, 22 Sep 2015 10:37:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwa-0002X1-D6 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:04 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 41/44-12371-F4F21065; Tue, 22 Sep 2015 10:37:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1442918222!51915973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24524 invoked from network); 22 Sep 2015 10:37:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwX-0007fM-W6 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwX-00034C-Tm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:01 +0000 Date: Tue, 22 Sep 2015 10:37:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] grant_table: implement grant_table_warn_active_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: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 502a592704ca782ba4fde0746464b68c52e6de7e Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:53:36 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:53:36 2015 +0200 grant_table: implement grant_table_warn_active_grants() Log first 10 active grants for a domain. This function is going to be used for soft reset, active grants on this path usually mean misbehaving backends refusing to release their mappings on shutdown. We need that in addition to the already existent 'g' keyhandler as such misbehaving backends can cause a domain to crash right after the soft reset operation and 'g' option won't be available in this case. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Jan Beulich --- xen/common/grant_table.c | 35 +++++++++++++++++++++++++++++++++++ xen/include/xen/grant_table.h | 5 +++++ 2 files changed, 40 insertions(+), 0 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 2b449d5..23185e7 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3352,6 +3352,41 @@ gnttab_release_mappings( } } +void grant_table_warn_active_grants(struct domain *d) +{ + struct grant_table *gt = d->grant_table; + struct active_grant_entry *act; + grant_ref_t ref; + unsigned int nr_active = 0; + +#define WARN_GRANT_MAX 10 + + read_lock(>->lock); + + for ( ref = 0; ref != nr_grant_entries(gt); ref++ ) + { + act = active_entry_acquire(gt, ref); + if ( !act->pin ) + { + active_entry_release(act); + continue; + } + + nr_active++; + if ( nr_active <= WARN_GRANT_MAX ) + printk(XENLOG_G_DEBUG "Dom%d has an active grant: GFN: %lx (MFN: %lx)\n", + d->domain_id, act->gfn, act->frame); + active_entry_release(act); + } + + if ( nr_active > WARN_GRANT_MAX ) + printk(XENLOG_G_DEBUG "Dom%d has too many (%d) active grants to report\n", + d->domain_id, nr_active); + + read_unlock(>->lock); + +#undef WARN_GRANT_MAX +} void grant_table_destroy( diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 5263fd6..1c29cee 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -89,6 +89,11 @@ void grant_table_destroy( struct domain *d); void grant_table_init_vcpu(struct vcpu *v); +/* + * Check if domain has active grants and log first 10 of them. + */ +void grant_table_warn_active_grants(struct domain *d); + /* Domain death release of granted mappings of other domains' memory. */ void gnttab_release_mappings( -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwm-0002Zl-Av; Tue, 22 Sep 2015 10:37:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwk-0002ZM-I8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:14 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3D/70-22089-95F21065; Tue, 22 Sep 2015 10:37:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1442918232!13389434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4838 invoked from network); 22 Sep 2015 10:37:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwi-0007fU-6i for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwi-00034k-45 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:12 +0000 Date: Tue, 22 Sep 2015 10:37:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce XEN_DOMCTL_soft_reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a043f9dc70255e8558e7daf05272d620696bee9 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:54:09 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:54:09 2015 +0200 introduce XEN_DOMCTL_soft_reset New domctl resets state for a domain allowing it to 'start over': register vcpu_info, switch to FIFO ABI for event channels. Still active grants are being logged to help debugging misbehaving backends. Signed-off-by: Vitaly Kuznetsov Acked-by: Jan Beulich --- xen/common/domain.c | 49 ++++++++++++++++++++++++++++++++++++------- xen/common/domctl.c | 9 ++++++++ xen/include/public/domctl.h | 1 + xen/include/xen/sched.h | 2 + 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 1b9fcfc..42c8caf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -110,6 +110,16 @@ static void vcpu_check_shutdown(struct vcpu *v) spin_unlock(&d->shutdown_lock); } +static void vcpu_info_reset(struct vcpu *v) +{ + struct domain *d = v->domain; + + v->vcpu_info = ((v->vcpu_id < XEN_LEGACY_MAX_VCPUS) + ? (vcpu_info_t *)&shared_info(d, vcpu_info[v->vcpu_id]) + : &dummy_vcpu_info); + v->vcpu_info_mfn = INVALID_MFN; +} + struct vcpu *alloc_vcpu( struct domain *d, unsigned int vcpu_id, unsigned int cpu_id) { @@ -145,10 +155,7 @@ struct vcpu *alloc_vcpu( v->runstate.state = RUNSTATE_offline; v->runstate.state_entry_time = NOW(); set_bit(_VPF_down, &v->pause_flags); - v->vcpu_info = ((vcpu_id < XEN_LEGACY_MAX_VCPUS) - ? (vcpu_info_t *)&shared_info(d, vcpu_info[vcpu_id]) - : &dummy_vcpu_info); - v->vcpu_info_mfn = INVALID_MFN; + vcpu_info_reset(v); init_waitqueue_vcpu(v); } @@ -1038,6 +1045,34 @@ void domain_unpause_except_self(struct domain *d) domain_unpause(d); } +int domain_soft_reset(struct domain *d) +{ + struct vcpu *v; + int rc; + + spin_lock(&d->shutdown_lock); + for_each_vcpu ( d, v ) + if ( !v->paused_for_shutdown ) + { + spin_unlock(&d->shutdown_lock); + return -EINVAL; + } + spin_unlock(&d->shutdown_lock); + + rc = evtchn_reset(d); + if ( rc ) + return rc; + + grant_table_warn_active_grants(d); + + for_each_vcpu ( d, v ) + unmap_vcpu_info(v); + + domain_resume(d); + + return 0; +} + int vcpu_reset(struct vcpu *v) { struct domain *d = v->domain; @@ -1149,8 +1184,7 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset) /* * Unmap the vcpu info page if the guest decided to place it somewhere - * else. This is only used from arch_domain_destroy, so there's no - * need to do anything clever. + * else. This is used from arch_domain_destroy and domain_soft_reset. */ void unmap_vcpu_info(struct vcpu *v) { @@ -1163,8 +1197,7 @@ void unmap_vcpu_info(struct vcpu *v) unmap_domain_page_global((void *) ((unsigned long)v->vcpu_info & PAGE_MASK)); - v->vcpu_info = &dummy_vcpu_info; - v->vcpu_info_mfn = INVALID_MFN; + vcpu_info_reset(v); put_page_and_type(mfn_to_page(mfn)); } diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 3bf39f1..9e0fef5 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -704,6 +704,15 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; } + case XEN_DOMCTL_soft_reset: + if ( d == current->domain ) + { + ret = -EINVAL; + break; + } + ret = domain_soft_reset(d); + break; + case XEN_DOMCTL_destroydomain: ret = domain_kill(d); if ( ret == -ERESTART ) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 675f021..794d4d5 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1139,6 +1139,7 @@ struct xen_domctl { #define XEN_DOMCTL_psr_cmt_op 75 #define XEN_DOMCTL_monitor_op 77 #define XEN_DOMCTL_psr_cat_op 78 +#define XEN_DOMCTL_soft_reset 79 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 73d3bc8..8053b5a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -610,6 +610,8 @@ void domain_shutdown(struct domain *d, u8 reason); void domain_resume(struct domain *d); void domain_pause_for_debugger(void); +int domain_soft_reset(struct domain *d); + int vcpu_start_shutdown_deferral(struct vcpu *v); void vcpu_end_shutdown_deferral(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwm-0002Zl-Av; Tue, 22 Sep 2015 10:37:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwk-0002ZM-I8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:14 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 3D/70-22089-95F21065; Tue, 22 Sep 2015 10:37:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1442918232!13389434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4838 invoked from network); 22 Sep 2015 10:37:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwi-0007fU-6i for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKwi-00034k-45 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:12 +0000 Date: Tue, 22 Sep 2015 10:37:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] introduce XEN_DOMCTL_soft_reset X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a043f9dc70255e8558e7daf05272d620696bee9 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:54:09 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:54:09 2015 +0200 introduce XEN_DOMCTL_soft_reset New domctl resets state for a domain allowing it to 'start over': register vcpu_info, switch to FIFO ABI for event channels. Still active grants are being logged to help debugging misbehaving backends. Signed-off-by: Vitaly Kuznetsov Acked-by: Jan Beulich --- xen/common/domain.c | 49 ++++++++++++++++++++++++++++++++++++------- xen/common/domctl.c | 9 ++++++++ xen/include/public/domctl.h | 1 + xen/include/xen/sched.h | 2 + 4 files changed, 53 insertions(+), 8 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index 1b9fcfc..42c8caf 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -110,6 +110,16 @@ static void vcpu_check_shutdown(struct vcpu *v) spin_unlock(&d->shutdown_lock); } +static void vcpu_info_reset(struct vcpu *v) +{ + struct domain *d = v->domain; + + v->vcpu_info = ((v->vcpu_id < XEN_LEGACY_MAX_VCPUS) + ? (vcpu_info_t *)&shared_info(d, vcpu_info[v->vcpu_id]) + : &dummy_vcpu_info); + v->vcpu_info_mfn = INVALID_MFN; +} + struct vcpu *alloc_vcpu( struct domain *d, unsigned int vcpu_id, unsigned int cpu_id) { @@ -145,10 +155,7 @@ struct vcpu *alloc_vcpu( v->runstate.state = RUNSTATE_offline; v->runstate.state_entry_time = NOW(); set_bit(_VPF_down, &v->pause_flags); - v->vcpu_info = ((vcpu_id < XEN_LEGACY_MAX_VCPUS) - ? (vcpu_info_t *)&shared_info(d, vcpu_info[vcpu_id]) - : &dummy_vcpu_info); - v->vcpu_info_mfn = INVALID_MFN; + vcpu_info_reset(v); init_waitqueue_vcpu(v); } @@ -1038,6 +1045,34 @@ void domain_unpause_except_self(struct domain *d) domain_unpause(d); } +int domain_soft_reset(struct domain *d) +{ + struct vcpu *v; + int rc; + + spin_lock(&d->shutdown_lock); + for_each_vcpu ( d, v ) + if ( !v->paused_for_shutdown ) + { + spin_unlock(&d->shutdown_lock); + return -EINVAL; + } + spin_unlock(&d->shutdown_lock); + + rc = evtchn_reset(d); + if ( rc ) + return rc; + + grant_table_warn_active_grants(d); + + for_each_vcpu ( d, v ) + unmap_vcpu_info(v); + + domain_resume(d); + + return 0; +} + int vcpu_reset(struct vcpu *v) { struct domain *d = v->domain; @@ -1149,8 +1184,7 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset) /* * Unmap the vcpu info page if the guest decided to place it somewhere - * else. This is only used from arch_domain_destroy, so there's no - * need to do anything clever. + * else. This is used from arch_domain_destroy and domain_soft_reset. */ void unmap_vcpu_info(struct vcpu *v) { @@ -1163,8 +1197,7 @@ void unmap_vcpu_info(struct vcpu *v) unmap_domain_page_global((void *) ((unsigned long)v->vcpu_info & PAGE_MASK)); - v->vcpu_info = &dummy_vcpu_info; - v->vcpu_info_mfn = INVALID_MFN; + vcpu_info_reset(v); put_page_and_type(mfn_to_page(mfn)); } diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 3bf39f1..9e0fef5 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -704,6 +704,15 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; } + case XEN_DOMCTL_soft_reset: + if ( d == current->domain ) + { + ret = -EINVAL; + break; + } + ret = domain_soft_reset(d); + break; + case XEN_DOMCTL_destroydomain: ret = domain_kill(d); if ( ret == -ERESTART ) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 675f021..794d4d5 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1139,6 +1139,7 @@ struct xen_domctl { #define XEN_DOMCTL_psr_cmt_op 75 #define XEN_DOMCTL_monitor_op 77 #define XEN_DOMCTL_psr_cat_op 78 +#define XEN_DOMCTL_soft_reset 79 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 73d3bc8..8053b5a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -610,6 +610,8 @@ void domain_shutdown(struct domain *d, u8 reason); void domain_resume(struct domain *d); void domain_pause_for_debugger(void); +int domain_soft_reset(struct domain *d); + int vcpu_start_shutdown_deferral(struct vcpu *v); void vcpu_end_shutdown_deferral(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37: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 1ZeKww-0002c1-Da; Tue, 22 Sep 2015 10:37:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwv-0002bi-2w for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:25 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 42/41-19220-46F21065; Tue, 22 Sep 2015 10:37:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1442918242!13389492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6834 invoked from network); 22 Sep 2015 10:37:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKws-0007ff-Db for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKws-00035D-BU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:22 +0000 Date: Tue, 22 Sep 2015 10:37:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: DOMCTL_soft_reset support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8cc7f2727591d5525870031f28ecbdf0c1890772 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:54:48 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:54:48 2015 +0200 flask: DOMCTL_soft_reset support Add new soft_reset vector to domain2 class, add it to create_domain in the default policy. Signed-off-by: Vitaly Kuznetsov Acked-by: Daniel De Graaf --- tools/flask/policy/policy/modules/xen/xen.if | 2 +- xen/xsm/flask/hooks.c | 3 +++ xen/xsm/flask/policy/access_vectors | 2 ++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index a2f25e1..32dd7b3 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -52,7 +52,7 @@ define(`create_domain_common', ` getaffinity setaffinity setvcpuextstate }; allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo cacheflush - psr_cmt_op psr_cat_op }; + psr_cmt_op psr_cat_op soft_reset }; 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 updatemp }; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index fafb1a4..4180f3b 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -738,6 +738,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cat_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CAT_OP); + case XEN_DOMCTL_soft_reset: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SOFT_RESET); + 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 0aa68f8..effb59f 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -232,6 +232,8 @@ class domain2 # XEN_DOMCTL_monitor_op # XEN_DOMCTL_vm_event_op vm_event +# XEN_DOMCTL_soft_reset + soft_reset # XENMEM_access_op mem_access # XENMEM_paging_op -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37: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 1ZeKww-0002c1-Da; Tue, 22 Sep 2015 10:37:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKwv-0002bi-2w for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:25 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 42/41-19220-46F21065; Tue, 22 Sep 2015 10:37:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1442918242!13389492!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6834 invoked from network); 22 Sep 2015 10:37:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKws-0007ff-Db for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKws-00035D-BU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:22 +0000 Date: Tue, 22 Sep 2015 10:37:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: DOMCTL_soft_reset support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8cc7f2727591d5525870031f28ecbdf0c1890772 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:54:48 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:54:48 2015 +0200 flask: DOMCTL_soft_reset support Add new soft_reset vector to domain2 class, add it to create_domain in the default policy. Signed-off-by: Vitaly Kuznetsov Acked-by: Daniel De Graaf --- tools/flask/policy/policy/modules/xen/xen.if | 2 +- xen/xsm/flask/hooks.c | 3 +++ xen/xsm/flask/policy/access_vectors | 2 ++ 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index a2f25e1..32dd7b3 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -52,7 +52,7 @@ define(`create_domain_common', ` getaffinity setaffinity setvcpuextstate }; allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo cacheflush - psr_cmt_op psr_cat_op }; + psr_cmt_op psr_cat_op soft_reset }; 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 updatemp }; diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index fafb1a4..4180f3b 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -738,6 +738,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_psr_cat_op: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CAT_OP); + case XEN_DOMCTL_soft_reset: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SOFT_RESET); + 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 0aa68f8..effb59f 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -232,6 +232,8 @@ class domain2 # XEN_DOMCTL_monitor_op # XEN_DOMCTL_vm_event_op vm_event +# XEN_DOMCTL_soft_reset + soft_reset # XENMEM_access_op mem_access # XENMEM_paging_op -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37: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 1ZeKx6-0002eB-GR; Tue, 22 Sep 2015 10:37:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKx5-0002dq-5x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:35 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id B8/BD-05269-E6F21065; Tue, 22 Sep 2015 10:37:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442918252!46366827!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6605 invoked from network); 22 Sep 2015 10:37: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; 22 Sep 2015 10:37:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKx2-0007fn-J5 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKx2-00036U-Hb for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:32 +0000 Date: Tue, 22 Sep 2015 10:37:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch-specific hooks for domain_soft_reset() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3235cbfe803048f9c0b513b362ecda47771c33d1 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:57:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:57:40 2015 +0200 arch-specific hooks for domain_soft_reset() x86-specific hook cleans up the pirq-emuirq mappings, destroys all ioreq servers and and replaces the shared_info frame with an empty page to support subsequent XENMAPSPACE_shared_info call. ARM-specific hook is -ENOSYS for now. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell Acked-by: Jan Beulich --- xen/arch/arm/domain.c | 5 +++ xen/arch/x86/domain.c | 81 +++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 5 +++ xen/common/domain.c | 8 +++- xen/include/asm-x86/hvm/hvm.h | 1 + xen/include/xen/domain.h | 2 + 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index b2bfc7d..5bdc2e9 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -655,6 +655,11 @@ void arch_domain_unpause(struct domain *d) { } +int arch_domain_soft_reset(struct domain *d) +{ + return -ENOSYS; +} + static int is_guest_pv32_psr(uint32_t psr) { switch (psr & PSR_MODE_MASK) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 7b73d47..5ff09e7 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -709,6 +709,87 @@ void arch_domain_unpause(struct domain *d) viridian_time_ref_count_thaw(d); } +int arch_domain_soft_reset(struct domain *d) +{ + struct page_info *page = virt_to_page(d->shared_info), *new_page; + int ret = 0; + struct domain *owner; + unsigned long mfn, gfn; + p2m_type_t p2mt; + unsigned int i; + + /* Soft reset is supported for HVM/PVH domains only. */ + if ( !has_hvm_container_domain(d) ) + return -EINVAL; + + hvm_domain_soft_reset(d); + + spin_lock(&d->event_lock); + for ( i = 0; i < d->nr_pirqs ; i++ ) + { + if ( domain_pirq_to_emuirq(d, i) != IRQ_UNBOUND ) + { + ret = unmap_domain_pirq_emuirq(d, i); + if ( ret ) + break; + } + } + spin_unlock(&d->event_lock); + + if ( ret ) + return ret; + + /* + * The shared_info page needs to be replaced with a new page, otherwise we + * will get a hole if the domain does XENMAPSPACE_shared_info. + */ + + owner = page_get_owner_and_reference(page); + ASSERT( owner == d ); + + mfn = page_to_mfn(page); + gfn = mfn_to_gmfn(d, mfn); + + /* + * gfn == INVALID_GFN indicates that the shared_info page was never mapped + * to the domain's address space and there is nothing to replace. + */ + if ( gfn == INVALID_GFN ) + goto exit_put_page; + + if ( mfn_x(get_gfn_query(d, gfn, &p2mt)) != mfn ) + { + printk(XENLOG_G_ERR "Failed to get Dom%d's shared_info GFN (%lx)\n", + d->domain_id, gfn); + ret = -EINVAL; + goto exit_put_page; + } + + new_page = alloc_domheap_page(d, 0); + if ( !new_page ) + { + printk(XENLOG_G_ERR "Failed to alloc a page to replace" + " Dom%d's shared_info frame %lx\n", d->domain_id, gfn); + ret = -ENOMEM; + goto exit_put_gfn; + } + guest_physmap_remove_page(d, gfn, mfn, PAGE_ORDER_4K); + + ret = guest_physmap_add_page(d, gfn, page_to_mfn(new_page), PAGE_ORDER_4K); + if ( ret ) + { + printk(XENLOG_G_ERR "Failed to add a page to replace" + " Dom%d's shared_info frame %lx\n", d->domain_id, gfn); + free_domheap_page(new_page); + } + exit_put_gfn: + put_gfn(d, gfn); + exit_put_page: + put_page(page); + + return ret; +} + /* * These are the masks of CR4 bits (subject to hardware availability) which a * PV guest may not legitimiately attempt to modify. diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1ec6c41..f082b86 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6877,6 +6877,11 @@ int hvm_set_mode(struct vcpu *v, int mode) return 0; } +void hvm_domain_soft_reset(struct domain *d) +{ + hvm_destroy_all_ioreq_servers(d); +} + /* * Local variables: * mode: C diff --git a/xen/common/domain.c b/xen/common/domain.c index 42c8caf..8e7a282 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1068,9 +1068,13 @@ int domain_soft_reset(struct domain *d) for_each_vcpu ( d, v ) unmap_vcpu_info(v); - domain_resume(d); + rc = arch_domain_soft_reset(d); + if ( !rc ) + domain_resume(d); + else + domain_crash(d); - return 0; + return rc; } int vcpu_reset(struct vcpu *v) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index c21a768..9f49e6d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -226,6 +226,7 @@ extern const struct hvm_function_table *start_vmx(void); int hvm_domain_initialise(struct domain *d); void hvm_domain_relinquish_resources(struct domain *d); void hvm_domain_destroy(struct domain *d); +void hvm_domain_soft_reset(struct domain *d); int hvm_vcpu_initialise(struct vcpu *v); void hvm_vcpu_destroy(struct vcpu *v); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 848db8a..a469fe0 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -65,6 +65,8 @@ void arch_domain_shutdown(struct domain *d); void arch_domain_pause(struct domain *d); void arch_domain_unpause(struct domain *d); +int arch_domain_soft_reset(struct domain *d); + int arch_set_info_guest(struct vcpu *, vcpu_guest_context_u); void arch_get_info_guest(struct vcpu *, vcpu_guest_context_u); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37: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 1ZeKx6-0002eB-GR; Tue, 22 Sep 2015 10:37:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKx5-0002dq-5x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:35 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id B8/BD-05269-E6F21065; Tue, 22 Sep 2015 10:37:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442918252!46366827!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6605 invoked from network); 22 Sep 2015 10:37: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; 22 Sep 2015 10:37:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKx2-0007fn-J5 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKx2-00036U-Hb for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:32 +0000 Date: Tue, 22 Sep 2015 10:37:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch-specific hooks for domain_soft_reset() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3235cbfe803048f9c0b513b362ecda47771c33d1 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:57:40 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:57:40 2015 +0200 arch-specific hooks for domain_soft_reset() x86-specific hook cleans up the pirq-emuirq mappings, destroys all ioreq servers and and replaces the shared_info frame with an empty page to support subsequent XENMAPSPACE_shared_info call. ARM-specific hook is -ENOSYS for now. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell Acked-by: Jan Beulich --- xen/arch/arm/domain.c | 5 +++ xen/arch/x86/domain.c | 81 +++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 5 +++ xen/common/domain.c | 8 +++- xen/include/asm-x86/hvm/hvm.h | 1 + xen/include/xen/domain.h | 2 + 6 files changed, 100 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index b2bfc7d..5bdc2e9 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -655,6 +655,11 @@ void arch_domain_unpause(struct domain *d) { } +int arch_domain_soft_reset(struct domain *d) +{ + return -ENOSYS; +} + static int is_guest_pv32_psr(uint32_t psr) { switch (psr & PSR_MODE_MASK) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 7b73d47..5ff09e7 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -709,6 +709,87 @@ void arch_domain_unpause(struct domain *d) viridian_time_ref_count_thaw(d); } +int arch_domain_soft_reset(struct domain *d) +{ + struct page_info *page = virt_to_page(d->shared_info), *new_page; + int ret = 0; + struct domain *owner; + unsigned long mfn, gfn; + p2m_type_t p2mt; + unsigned int i; + + /* Soft reset is supported for HVM/PVH domains only. */ + if ( !has_hvm_container_domain(d) ) + return -EINVAL; + + hvm_domain_soft_reset(d); + + spin_lock(&d->event_lock); + for ( i = 0; i < d->nr_pirqs ; i++ ) + { + if ( domain_pirq_to_emuirq(d, i) != IRQ_UNBOUND ) + { + ret = unmap_domain_pirq_emuirq(d, i); + if ( ret ) + break; + } + } + spin_unlock(&d->event_lock); + + if ( ret ) + return ret; + + /* + * The shared_info page needs to be replaced with a new page, otherwise we + * will get a hole if the domain does XENMAPSPACE_shared_info. + */ + + owner = page_get_owner_and_reference(page); + ASSERT( owner == d ); + + mfn = page_to_mfn(page); + gfn = mfn_to_gmfn(d, mfn); + + /* + * gfn == INVALID_GFN indicates that the shared_info page was never mapped + * to the domain's address space and there is nothing to replace. + */ + if ( gfn == INVALID_GFN ) + goto exit_put_page; + + if ( mfn_x(get_gfn_query(d, gfn, &p2mt)) != mfn ) + { + printk(XENLOG_G_ERR "Failed to get Dom%d's shared_info GFN (%lx)\n", + d->domain_id, gfn); + ret = -EINVAL; + goto exit_put_page; + } + + new_page = alloc_domheap_page(d, 0); + if ( !new_page ) + { + printk(XENLOG_G_ERR "Failed to alloc a page to replace" + " Dom%d's shared_info frame %lx\n", d->domain_id, gfn); + ret = -ENOMEM; + goto exit_put_gfn; + } + guest_physmap_remove_page(d, gfn, mfn, PAGE_ORDER_4K); + + ret = guest_physmap_add_page(d, gfn, page_to_mfn(new_page), PAGE_ORDER_4K); + if ( ret ) + { + printk(XENLOG_G_ERR "Failed to add a page to replace" + " Dom%d's shared_info frame %lx\n", d->domain_id, gfn); + free_domheap_page(new_page); + } + exit_put_gfn: + put_gfn(d, gfn); + exit_put_page: + put_page(page); + + return ret; +} + /* * These are the masks of CR4 bits (subject to hardware availability) which a * PV guest may not legitimiately attempt to modify. diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 1ec6c41..f082b86 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6877,6 +6877,11 @@ int hvm_set_mode(struct vcpu *v, int mode) return 0; } +void hvm_domain_soft_reset(struct domain *d) +{ + hvm_destroy_all_ioreq_servers(d); +} + /* * Local variables: * mode: C diff --git a/xen/common/domain.c b/xen/common/domain.c index 42c8caf..8e7a282 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1068,9 +1068,13 @@ int domain_soft_reset(struct domain *d) for_each_vcpu ( d, v ) unmap_vcpu_info(v); - domain_resume(d); + rc = arch_domain_soft_reset(d); + if ( !rc ) + domain_resume(d); + else + domain_crash(d); - return 0; + return rc; } int vcpu_reset(struct vcpu *v) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index c21a768..9f49e6d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -226,6 +226,7 @@ extern const struct hvm_function_table *start_vmx(void); int hvm_domain_initialise(struct domain *d); void hvm_domain_relinquish_resources(struct domain *d); void hvm_domain_destroy(struct domain *d); +void hvm_domain_soft_reset(struct domain *d); int hvm_vcpu_initialise(struct vcpu *v); void hvm_vcpu_destroy(struct vcpu *v); diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 848db8a..a469fe0 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -65,6 +65,8 @@ void arch_domain_shutdown(struct domain *d); void arch_domain_pause(struct domain *d); void arch_domain_unpause(struct domain *d); +int arch_domain_soft_reset(struct domain *d); + int arch_set_info_guest(struct vcpu *, vcpu_guest_context_u); void arch_get_info_guest(struct vcpu *, vcpu_guest_context_u); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxH-0002pO-J6; Tue, 22 Sep 2015 10:37:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxF-0002p7-W8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:46 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 1D/03-18744-97F21065; Tue, 22 Sep 2015 10:37:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442918263!49536124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30281 invoked from network); 22 Sep 2015 10:37:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxC-0007fs-P0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxC-00036s-NP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:42 +0000 Date: Tue, 22 Sep 2015 10:37:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: support XEN_DOMCTL_soft_reset operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1bd9812966de9a16f30a58e7162b80bd6af361b Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:58:17 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:58:17 2015 +0200 libxc: support XEN_DOMCTL_soft_reset operation Introduce xc_domain_soft_reset() function supporting XEN_DOMCTL_soft_reset. Signed-off-by: Vitaly Kuznetsov Acked-by: Wei Liu Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson --- tools/libxc/include/xenctrl.h | 3 +++ tools/libxc/xc_domain.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 2000f12..e019474 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1288,6 +1288,9 @@ int xc_domain_setvnuma(xc_interface *xch, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); +int xc_domain_soft_reset(xc_interface *xch, + uint32_t domid); + #if defined(__i386__) || defined(__x86_64__) /* * PC BIOS standard E820 types and structure. diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 780797f..62b2e45 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2493,6 +2493,15 @@ int xc_domain_setvnuma(xc_interface *xch, return rc; } + +int xc_domain_soft_reset(xc_interface *xch, + uint32_t domid) +{ + DECLARE_DOMCTL; + domctl.cmd = XEN_DOMCTL_soft_reset; + domctl.domain = (domid_t)domid; + return do_domctl(xch, &domctl); +} /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxH-0002pO-J6; Tue, 22 Sep 2015 10:37:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxF-0002p7-W8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:46 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 1D/03-18744-97F21065; Tue, 22 Sep 2015 10:37:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442918263!49536124!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30281 invoked from network); 22 Sep 2015 10:37:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxC-0007fs-P0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxC-00036s-NP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:42 +0000 Date: Tue, 22 Sep 2015 10:37:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: support XEN_DOMCTL_soft_reset operation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e1bd9812966de9a16f30a58e7162b80bd6af361b Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:58:17 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:58:17 2015 +0200 libxc: support XEN_DOMCTL_soft_reset operation Introduce xc_domain_soft_reset() function supporting XEN_DOMCTL_soft_reset. Signed-off-by: Vitaly Kuznetsov Acked-by: Wei Liu Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Jackson --- tools/libxc/include/xenctrl.h | 3 +++ tools/libxc/xc_domain.c | 9 +++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 2000f12..e019474 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1288,6 +1288,9 @@ int xc_domain_setvnuma(xc_interface *xch, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); +int xc_domain_soft_reset(xc_interface *xch, + uint32_t domid); + #if defined(__i386__) || defined(__x86_64__) /* * PC BIOS standard E820 types and structure. diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 780797f..62b2e45 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2493,6 +2493,15 @@ int xc_domain_setvnuma(xc_interface *xch, return rc; } + +int xc_domain_soft_reset(xc_interface *xch, + uint32_t domid) +{ + DECLARE_DOMCTL; + domctl.cmd = XEN_DOMCTL_soft_reset; + domctl.domain = (domid_t)domid; + return do_domctl(xch, &domctl); +} /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37: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 1ZeKxQ-0002r8-Lb; Tue, 22 Sep 2015 10:37:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxP-0002ql-94 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:55 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 49/B0-00536-28F21065; Tue, 22 Sep 2015 10:37:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442918273!45245387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28785 invoked from network); 22 Sep 2015 10:37:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxM-0007g3-Uu for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxM-00037E-Ts for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:52 +0000 Date: Tue, 22 Sep 2015 10:37:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add LIBXL_DEVICE_MODEL_SAVE_FILE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64d148bae0a0fb6ac346087d6b80b7d8784c1c97 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:58:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:58:26 2015 +0200 libxl: add LIBXL_DEVICE_MODEL_SAVE_FILE Use this in libxl_dm instead of hard-coding. Signed-off-by: Vitaly Kuznetsov Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 2 +- tools/libxl/libxl_internal.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index c84085e..b7c6592 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -31,7 +31,7 @@ static const char *libxl_tapif_script(libxl__gc *gc) const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid) { - return libxl__sprintf(gc, "/var/lib/xen/qemu-save.%d", domid); + return libxl__sprintf(gc, LIBXL_DEVICE_MODEL_SAVE_FILE".%d", domid); } static const char *qemu_xen_path(libxl__gc *gc) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6ea6c83..c3c3b7b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -90,6 +90,7 @@ /* QEMU may be slow to load and start due to a bug in Linux where the I/O * subsystem sometime produce high latency under load. */ #define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 +#define LIBXL_DEVICE_MODEL_SAVE_FILE "/var/lib/xen/qemu-save" /* .$domid */ #define LIBXL_DEVICE_MODEL_RESTORE_FILE "/var/lib/xen/qemu-resume" /* .$domid */ #define LIBXL_STUBDOM_START_TIMEOUT 30 #define LIBXL_QEMU_BODGE_TIMEOUT 2 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:37:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:37: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 1ZeKxQ-0002r8-Lb; Tue, 22 Sep 2015 10:37:56 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxP-0002ql-94 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:55 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 49/B0-00536-28F21065; Tue, 22 Sep 2015 10:37:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442918273!45245387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28785 invoked from network); 22 Sep 2015 10:37:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:37:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxM-0007g3-Uu for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxM-00037E-Ts for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:37:52 +0000 Date: Tue, 22 Sep 2015 10:37:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add LIBXL_DEVICE_MODEL_SAVE_FILE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 64d148bae0a0fb6ac346087d6b80b7d8784c1c97 Author: Vitaly Kuznetsov AuthorDate: Thu Sep 10 16:58:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 16:58:26 2015 +0200 libxl: add LIBXL_DEVICE_MODEL_SAVE_FILE Use this in libxl_dm instead of hard-coding. Signed-off-by: Vitaly Kuznetsov Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 2 +- tools/libxl/libxl_internal.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index c84085e..b7c6592 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -31,7 +31,7 @@ static const char *libxl_tapif_script(libxl__gc *gc) const char *libxl__device_model_savefile(libxl__gc *gc, uint32_t domid) { - return libxl__sprintf(gc, "/var/lib/xen/qemu-save.%d", domid); + return libxl__sprintf(gc, LIBXL_DEVICE_MODEL_SAVE_FILE".%d", domid); } static const char *qemu_xen_path(libxl__gc *gc) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 6ea6c83..c3c3b7b 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -90,6 +90,7 @@ /* QEMU may be slow to load and start due to a bug in Linux where the I/O * subsystem sometime produce high latency under load. */ #define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 +#define LIBXL_DEVICE_MODEL_SAVE_FILE "/var/lib/xen/qemu-save" /* .$domid */ #define LIBXL_DEVICE_MODEL_RESTORE_FILE "/var/lib/xen/qemu-resume" /* .$domid */ #define LIBXL_STUBDOM_START_TIMEOUT 30 #define LIBXL_QEMU_BODGE_TIMEOUT 2 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxa-0002tu-4J; Tue, 22 Sep 2015 10:38:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxZ-0002tY-6J for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:05 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 25/82-02380-C8F21065; Tue, 22 Sep 2015 10:38:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1442918283!36850546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9978 invoked from network); 22 Sep 2015 10:38: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; 22 Sep 2015 10:38:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxX-0007gm-4J for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxX-00037k-1n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:03 +0000 Date: Tue, 22 Sep 2015 10:38:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1910471e5a79ce05f364efd8db84c8f4273ee832 Author: Ian Jackson AuthorDate: Fri Sep 11 11:18:53 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:18:53 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 68adb88..a1d515f 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 5cdde31eacdd288359746019ad05cac8ed5d9f70 -# Fri Aug 28 15:53:40 2015 +0100 -# HVM: atomically access pointers in bufioreq handling +QEMU_TRADITIONAL_REVISION ?= 1c8d43cbdf0fc01a8f05acfbf55b805a83da34bb +# Tue Sep 8 15:41:20 2015 +0100 +# Fix build after "ui/vnc: limit client_cut_text msg payload size" # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxa-0002tu-4J; Tue, 22 Sep 2015 10:38:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxZ-0002tY-6J for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:05 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 25/82-02380-C8F21065; Tue, 22 Sep 2015 10:38:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1442918283!36850546!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9978 invoked from network); 22 Sep 2015 10:38: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; 22 Sep 2015 10:38:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxX-0007gm-4J for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxX-00037k-1n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:03 +0000 Date: Tue, 22 Sep 2015 10:38:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1910471e5a79ce05f364efd8db84c8f4273ee832 Author: Ian Jackson AuthorDate: Fri Sep 11 11:18:53 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:18:53 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 68adb88..a1d515f 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 5cdde31eacdd288359746019ad05cac8ed5d9f70 -# Fri Aug 28 15:53:40 2015 +0100 -# HVM: atomically access pointers in bufioreq handling +QEMU_TRADITIONAL_REVISION ?= 1c8d43cbdf0fc01a8f05acfbf55b805a83da34bb +# Tue Sep 8 15:41:20 2015 +0100 +# Fix build after "ui/vnc: limit client_cut_text msg payload size" # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxl-0002xO-9A; Tue, 22 Sep 2015 10:38:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxk-0002x5-JI for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:16 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 44/4F-05269-79F21065; Tue, 22 Sep 2015 10:38:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442918293!11868047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13700 invoked from network); 22 Sep 2015 10:38: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; 22 Sep 2015 10:38:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxh-0007gu-8u for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxh-00038C-7x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:13 +0000 Date: Tue, 22 Sep 2015 10:38:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm re-order assignments in mfn_to_xen_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 a3a2dad62ad647a0d32a4560eb24ffc005221fbc Author: Chris Brand AuthorDate: Thu Sep 10 11:56:28 2015 -0700 Commit: Ian Campbell CommitDate: Fri Sep 11 14:29:33 2015 +0100 xen: arm re-order assignments in mfn_to_xen_entry() Shuffle lines around so that the assignments in mfn_to_xen_entry() occur in the same order as the bits are declared in lpae_pt_t. This makes it easier to see which ones are never given a value. No change in behaviour. Also fix a minor comment typo. Signed-off-by: Chris Brand Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/page.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 5ecfd07..01628f3 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -197,18 +197,18 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) paddr_t pa = ((paddr_t) mfn) << PAGE_SHIFT; lpae_t e = (lpae_t) { .pt = { - .xn = 1, /* No need to execute outside .text */ - .ng = 1, /* Makes TLB flushes easier */ - .af = 1, /* No need for access tracking */ + .valid = 1, /* Mappings are present */ + .table = 0, /* Set to 1 for links and 4k maps */ + .ai = attr, .ns = 1, /* Hyp mode is in the non-secure world */ .user = 1, /* See below */ - .ai = attr, - .table = 0, /* Set to 1 for links and 4k maps */ - .valid = 1, /* Mappings are present */ + .af = 1, /* No need for access tracking */ + .ng = 1, /* Makes TLB flushes easier */ + .xn = 1, /* No need to execute outside .text */ }};; /* Setting the User bit is strange, but the ATS1H[RW] instructions * don't seem to work otherwise, and since we never run on Xen - * pagetables un User mode it's OK. If this changes, remember + * pagetables in User mode it's OK. If this changes, remember * to update the hard-coded values in head.S too */ switch ( attr ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxl-0002xO-9A; Tue, 22 Sep 2015 10:38:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxk-0002x5-JI for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:16 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 44/4F-05269-79F21065; Tue, 22 Sep 2015 10:38:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442918293!11868047!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13700 invoked from network); 22 Sep 2015 10:38: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; 22 Sep 2015 10:38:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxh-0007gu-8u for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxh-00038C-7x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:13 +0000 Date: Tue, 22 Sep 2015 10:38:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm re-order assignments in mfn_to_xen_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 a3a2dad62ad647a0d32a4560eb24ffc005221fbc Author: Chris Brand AuthorDate: Thu Sep 10 11:56:28 2015 -0700 Commit: Ian Campbell CommitDate: Fri Sep 11 14:29:33 2015 +0100 xen: arm re-order assignments in mfn_to_xen_entry() Shuffle lines around so that the assignments in mfn_to_xen_entry() occur in the same order as the bits are declared in lpae_pt_t. This makes it easier to see which ones are never given a value. No change in behaviour. Also fix a minor comment typo. Signed-off-by: Chris Brand Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/page.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 5ecfd07..01628f3 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -197,18 +197,18 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) paddr_t pa = ((paddr_t) mfn) << PAGE_SHIFT; lpae_t e = (lpae_t) { .pt = { - .xn = 1, /* No need to execute outside .text */ - .ng = 1, /* Makes TLB flushes easier */ - .af = 1, /* No need for access tracking */ + .valid = 1, /* Mappings are present */ + .table = 0, /* Set to 1 for links and 4k maps */ + .ai = attr, .ns = 1, /* Hyp mode is in the non-secure world */ .user = 1, /* See below */ - .ai = attr, - .table = 0, /* Set to 1 for links and 4k maps */ - .valid = 1, /* Mappings are present */ + .af = 1, /* No need for access tracking */ + .ng = 1, /* Makes TLB flushes easier */ + .xn = 1, /* No need to execute outside .text */ }};; /* Setting the User bit is strange, but the ATS1H[RW] instructions * don't seem to work otherwise, and since we never run on Xen - * pagetables un User mode it's OK. If this changes, remember + * pagetables in User mode it's OK. If this changes, remember * to update the hard-coded values in head.S too */ switch ( attr ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKxv-0002zT-Bd; Tue, 22 Sep 2015 10:38:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxu-0002zA-B6 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:26 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id B5/45-03819-1AF21065; Tue, 22 Sep 2015 10:38:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1442918303!21141666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2348 invoked from network); 22 Sep 2015 10:38:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxr-0007h2-E3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxr-00038f-CU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:23 +0000 Date: Tue, 22 Sep 2015 10:38:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Be explicit about bit values in mfn_to_xen_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 d87d52248dc7d18ac27529fa5ea803a23126f0f0 Author: Chris Brand AuthorDate: Thu Sep 10 11:56:29 2015 -0700 Commit: Ian Campbell CommitDate: Fri Sep 11 14:29:34 2015 +0100 xen: arm: Be explicit about bit values in mfn_to_xen_entry() Ensure that every relevant bit is given an explicit value. This has no effect on the generated code, but makes it a little easier to follow. Reported-by: Julien Grall Signed-off-by: Chris Brand Acked-by: Ian Campbell --- xen/include/asm-arm/page.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 01628f3..a94e978 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -202,9 +202,12 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) .ai = attr, .ns = 1, /* Hyp mode is in the non-secure world */ .user = 1, /* See below */ + .ro = 0, /* Assume read-write */ .af = 1, /* No need for access tracking */ .ng = 1, /* Makes TLB flushes easier */ + .contig = 0, /* Assume non-contiguous */ .xn = 1, /* No need to execute outside .text */ + .avail = 0, /* Reference count for domheap mapping */ }};; /* Setting the User bit is strange, but the ATS1H[RW] instructions * don't seem to work otherwise, and since we never run on Xen -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKxv-0002zT-Bd; Tue, 22 Sep 2015 10:38:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxu-0002zA-B6 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:26 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id B5/45-03819-1AF21065; Tue, 22 Sep 2015 10:38:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1442918303!21141666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2348 invoked from network); 22 Sep 2015 10:38:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKxr-0007h2-E3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKxr-00038f-CU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:23 +0000 Date: Tue, 22 Sep 2015 10:38:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Be explicit about bit values in mfn_to_xen_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 d87d52248dc7d18ac27529fa5ea803a23126f0f0 Author: Chris Brand AuthorDate: Thu Sep 10 11:56:29 2015 -0700 Commit: Ian Campbell CommitDate: Fri Sep 11 14:29:34 2015 +0100 xen: arm: Be explicit about bit values in mfn_to_xen_entry() Ensure that every relevant bit is given an explicit value. This has no effect on the generated code, but makes it a little easier to follow. Reported-by: Julien Grall Signed-off-by: Chris Brand Acked-by: Ian Campbell --- xen/include/asm-arm/page.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 01628f3..a94e978 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -202,9 +202,12 @@ static inline lpae_t mfn_to_xen_entry(unsigned long mfn, unsigned attr) .ai = attr, .ns = 1, /* Hyp mode is in the non-secure world */ .user = 1, /* See below */ + .ro = 0, /* Assume read-write */ .af = 1, /* No need for access tracking */ .ng = 1, /* Makes TLB flushes easier */ + .contig = 0, /* Assume non-contiguous */ .xn = 1, /* No need to execute outside .text */ + .avail = 0, /* Reference count for domheap mapping */ }};; /* Setting the User bit is strange, but the ATS1H[RW] instructions * don't seem to work otherwise, and since we never run on Xen -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKy5-00031i-EM; Tue, 22 Sep 2015 10:38:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKy4-00031M-3A for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:36 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 07/6F-26043-BAF21065; Tue, 22 Sep 2015 10:38:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442918313!49536411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4561 invoked from network); 22 Sep 2015 10:38:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKy1-0007hA-JC for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKy1-00039d-Hp for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:33 +0000 Date: Tue, 22 Sep 2015 10:38:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Support <32MB frametables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88ab6b65395b2c81ede747cf2d13814241111ee6 Author: Chris Brand AuthorDate: Fri Aug 21 14:30:37 2015 -0700 Commit: Ian Campbell CommitDate: Fri Sep 11 14:29:34 2015 +0100 xen: arm: Support <32MB frametables setup_frametable_mappings() rounds frametable_size up to a multiple of 32MB. This is wasteful on systems with less than 4GB of RAM, although it does allow the "contig" bit to be set in the PTEs. Where the frametable is less than 32MB in size, instead round up to a multiple of 2MB, not setting the "contig" bit in the PTEs. Signed-off-by: Chris Brand Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b5d8c85..8b6d915 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -628,25 +628,31 @@ void __cpuinit mmu_init_secondary_cpu(void) } /* Create Xen's mappings of memory. - * Base and virt must be 32MB aligned and size a multiple of 32MB. + * Mapping_size must be either 2MB or 32MB. + * Base and virt must be mapping_size aligned. + * Size must be a multiple of mapping_size. * second must be a contiguous set of second level page tables * covering the region starting at virt_offset. */ -static void __init create_32mb_mappings(lpae_t *second, - unsigned long virt_offset, - unsigned long base_mfn, - unsigned long nr_mfns) +static void __init create_mappings(lpae_t *second, + unsigned long virt_offset, + unsigned long base_mfn, + unsigned long nr_mfns, + unsigned int mapping_size) { unsigned long i, count; + const unsigned long granularity = mapping_size >> PAGE_SHIFT; lpae_t pte, *p; - ASSERT(!((virt_offset >> PAGE_SHIFT) % (16 * LPAE_ENTRIES))); - ASSERT(!(base_mfn % (16 * LPAE_ENTRIES))); - ASSERT(!(nr_mfns % (16 * LPAE_ENTRIES))); + ASSERT((mapping_size == MB(2)) || (mapping_size == MB(32))); + ASSERT(!((virt_offset >> PAGE_SHIFT) % granularity)); + ASSERT(!(base_mfn % granularity)); + ASSERT(!(nr_mfns % granularity)); count = nr_mfns / LPAE_ENTRIES; p = second + second_linear_offset(virt_offset); pte = mfn_to_xen_entry(base_mfn, WRITEALLOC); - pte.pt.contig = 1; /* These maps are in 16-entry contiguous chunks. */ + if ( granularity == 16 * LPAE_ENTRIES ) + pte.pt.contig = 1; /* These maps are in 16-entry contiguous chunks. */ for ( i = 0; i < count; i++ ) { write_pte(p + i, pte); @@ -660,7 +666,7 @@ static void __init create_32mb_mappings(lpae_t *second, void __init setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns) { - create_32mb_mappings(xen_second, XENHEAP_VIRT_START, base_mfn, nr_mfns); + create_mappings(xen_second, XENHEAP_VIRT_START, base_mfn, nr_mfns, MB(32)); /* Record where the xenheap is, for translation routines. */ xenheap_virt_end = XENHEAP_VIRT_START + nr_mfns * PAGE_SIZE; @@ -749,6 +755,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) unsigned long nr_pdxs = pfn_to_pdx(nr_pages); unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); unsigned long base_mfn; + const unsigned long mapping_size = frametable_size < MB(32) ? MB(2) : MB(32); #ifdef CONFIG_ARM_64 lpae_t *second, pte; unsigned long nr_second, second_base; @@ -756,9 +763,8 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) #endif frametable_base_pdx = pfn_to_pdx(ps >> PAGE_SHIFT); - - /* Round up to 32M boundary */ - frametable_size = (frametable_size + 0x1ffffff) & ~0x1ffffff; + /* Round up to 2M or 32M boundary, as appropriate. */ + frametable_size = ROUNDUP(frametable_size, mapping_size); base_mfn = alloc_boot_pages(frametable_size >> PAGE_SHIFT, 32<<(20-12)); #ifdef CONFIG_ARM_64 @@ -771,9 +777,10 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) pte.pt.table = 1; write_pte(&xen_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); } - create_32mb_mappings(second, 0, base_mfn, frametable_size >> PAGE_SHIFT); + create_mappings(second, 0, base_mfn, frametable_size >> PAGE_SHIFT, mapping_size); #else - create_32mb_mappings(xen_second, FRAMETABLE_VIRT_START, base_mfn, frametable_size >> PAGE_SHIFT); + create_mappings(xen_second, FRAMETABLE_VIRT_START, + base_mfn, frametable_size >> PAGE_SHIFT, mapping_size); #endif memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_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 Tue Sep 22 10:38:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKy5-00031i-EM; Tue, 22 Sep 2015 10:38:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKy4-00031M-3A for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:36 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 07/6F-26043-BAF21065; Tue, 22 Sep 2015 10:38:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442918313!49536411!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4561 invoked from network); 22 Sep 2015 10:38:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKy1-0007hA-JC for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKy1-00039d-Hp for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:33 +0000 Date: Tue, 22 Sep 2015 10:38:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Support <32MB frametables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88ab6b65395b2c81ede747cf2d13814241111ee6 Author: Chris Brand AuthorDate: Fri Aug 21 14:30:37 2015 -0700 Commit: Ian Campbell CommitDate: Fri Sep 11 14:29:34 2015 +0100 xen: arm: Support <32MB frametables setup_frametable_mappings() rounds frametable_size up to a multiple of 32MB. This is wasteful on systems with less than 4GB of RAM, although it does allow the "contig" bit to be set in the PTEs. Where the frametable is less than 32MB in size, instead round up to a multiple of 2MB, not setting the "contig" bit in the PTEs. Signed-off-by: Chris Brand Reviewed-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 37 ++++++++++++++++++++++--------------- 1 files changed, 22 insertions(+), 15 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index b5d8c85..8b6d915 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -628,25 +628,31 @@ void __cpuinit mmu_init_secondary_cpu(void) } /* Create Xen's mappings of memory. - * Base and virt must be 32MB aligned and size a multiple of 32MB. + * Mapping_size must be either 2MB or 32MB. + * Base and virt must be mapping_size aligned. + * Size must be a multiple of mapping_size. * second must be a contiguous set of second level page tables * covering the region starting at virt_offset. */ -static void __init create_32mb_mappings(lpae_t *second, - unsigned long virt_offset, - unsigned long base_mfn, - unsigned long nr_mfns) +static void __init create_mappings(lpae_t *second, + unsigned long virt_offset, + unsigned long base_mfn, + unsigned long nr_mfns, + unsigned int mapping_size) { unsigned long i, count; + const unsigned long granularity = mapping_size >> PAGE_SHIFT; lpae_t pte, *p; - ASSERT(!((virt_offset >> PAGE_SHIFT) % (16 * LPAE_ENTRIES))); - ASSERT(!(base_mfn % (16 * LPAE_ENTRIES))); - ASSERT(!(nr_mfns % (16 * LPAE_ENTRIES))); + ASSERT((mapping_size == MB(2)) || (mapping_size == MB(32))); + ASSERT(!((virt_offset >> PAGE_SHIFT) % granularity)); + ASSERT(!(base_mfn % granularity)); + ASSERT(!(nr_mfns % granularity)); count = nr_mfns / LPAE_ENTRIES; p = second + second_linear_offset(virt_offset); pte = mfn_to_xen_entry(base_mfn, WRITEALLOC); - pte.pt.contig = 1; /* These maps are in 16-entry contiguous chunks. */ + if ( granularity == 16 * LPAE_ENTRIES ) + pte.pt.contig = 1; /* These maps are in 16-entry contiguous chunks. */ for ( i = 0; i < count; i++ ) { write_pte(p + i, pte); @@ -660,7 +666,7 @@ static void __init create_32mb_mappings(lpae_t *second, void __init setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns) { - create_32mb_mappings(xen_second, XENHEAP_VIRT_START, base_mfn, nr_mfns); + create_mappings(xen_second, XENHEAP_VIRT_START, base_mfn, nr_mfns, MB(32)); /* Record where the xenheap is, for translation routines. */ xenheap_virt_end = XENHEAP_VIRT_START + nr_mfns * PAGE_SIZE; @@ -749,6 +755,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) unsigned long nr_pdxs = pfn_to_pdx(nr_pages); unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); unsigned long base_mfn; + const unsigned long mapping_size = frametable_size < MB(32) ? MB(2) : MB(32); #ifdef CONFIG_ARM_64 lpae_t *second, pte; unsigned long nr_second, second_base; @@ -756,9 +763,8 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) #endif frametable_base_pdx = pfn_to_pdx(ps >> PAGE_SHIFT); - - /* Round up to 32M boundary */ - frametable_size = (frametable_size + 0x1ffffff) & ~0x1ffffff; + /* Round up to 2M or 32M boundary, as appropriate. */ + frametable_size = ROUNDUP(frametable_size, mapping_size); base_mfn = alloc_boot_pages(frametable_size >> PAGE_SHIFT, 32<<(20-12)); #ifdef CONFIG_ARM_64 @@ -771,9 +777,10 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) pte.pt.table = 1; write_pte(&xen_first[first_table_offset(FRAMETABLE_VIRT_START)+i], pte); } - create_32mb_mappings(second, 0, base_mfn, frametable_size >> PAGE_SHIFT); + create_mappings(second, 0, base_mfn, frametable_size >> PAGE_SHIFT, mapping_size); #else - create_32mb_mappings(xen_second, FRAMETABLE_VIRT_START, base_mfn, frametable_size >> PAGE_SHIFT); + create_mappings(xen_second, FRAMETABLE_VIRT_START, + base_mfn, frametable_size >> PAGE_SHIFT, mapping_size); #endif memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_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 Tue Sep 22 10:38:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKyF-00033u-Gr; Tue, 22 Sep 2015 10:38:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyE-00033d-Ed for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:46 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 58/58-31450-5BF21065; Tue, 22 Sep 2015 10:38:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1442918323!13389939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17798 invoked from network); 22 Sep 2015 10:38:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyB-0007hI-OP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyB-0003A9-NO for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:43 +0000 Date: Tue, 22 Sep 2015 10:38:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93f5194e72708776783f2d34894c9b42031e116e Author: Ian Campbell AuthorDate: Fri Sep 11 11:42:51 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 14:42:40 2015 +0100 libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards The fd passed to us by libvirt for both save and restore has at least O_NONBLOCK set, which libxl does not expect and therefore fails to handle any EAGAIN which might arise. This has been observed with migration v2, but if v1 used to work I think that would be just be by luck and/or coincidence. Unix convention (and the principal of least surprise) is usually to ensure that an fd has no "strange" properties, such as being non-blocking, when handing it to another component. However for the convenience of the application arrange instead for libxl to clear any unexpected flags on the file descriptors it is given for save or restore and restore them to their original state at the end. O_NDELAY could be similarly problematic so clear that as well as O_NONBLOCK. To do this introduce a pair of new helper functions one to modify+save the flags and another to restore them and call them in the appropriate places. The migration v1 code appeared to do some things with O_NONBLOCK in the checkpoint case. Migration v2 doesn't seem to do so, and in any case I wouldn't expect it to be relying on libvirt's setting of O_NONBLOCK when xl doesn't use that flag. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu Cc: Jim Fehlig Cc: Andrew Cooper Cc: Shriram Rajagopalan Cc: Yang Hongyang --- tools/libxl/libxl.c | 65 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_create.c | 23 ++++++++++++++- tools/libxl/libxl_internal.h | 13 ++++++++ 3 files changed, 100 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 10d1909..6ebb96e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -952,6 +952,12 @@ static void domain_suspend_cb(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { STATE_AO_GC(dss->ao); + int flrc; + + flrc = libxl__fd_flags_restore(gc, dss->fd, dss->fdfl); + /* If suspend has failed already then report that error not this one. */ + if (flrc && !rc) rc = flrc; + libxl__ao_complete(egc,ao,rc); } @@ -980,6 +986,11 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, dss->live = flags & LIBXL_SUSPEND_LIVE; dss->debug = flags & LIBXL_SUSPEND_DEBUG; + rc = libxl__fd_flags_modify_save(gc, dss->fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &dss->fdfl); + if (rc < 0) goto out_err; + libxl__domain_save(egc, dss); return AO_INPROGRESS; @@ -6507,6 +6518,60 @@ int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } +int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags) +{ + int rc, ret, fdfl; + + fdfl = fcntl(fd, F_GETFL); + if (fdfl < 0) { + LOGE(ERROR, "failed to fcntl.F_GETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + + if (r_oldflags) + *r_oldflags = fdfl; + + fdfl &= mask; + fdfl |= val; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; +} + +int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) +{ + int ret, rc; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; + +} void libxl_hwcap_copy(libxl_ctx *ctx,libxl_hwcap *dst, libxl_hwcap *src) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 29c2641..f5771da 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1556,6 +1556,7 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, { AO_CREATE(ctx, 0, ao_how); libxl__app_domain_create_state *cdcs; + int rc; GCNEW(cdcs); cdcs->dcs.ao = ao; @@ -1563,8 +1564,13 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_domain_config_init(&cdcs->dcs.guest_config_saved); libxl_domain_config_copy(ctx, &cdcs->dcs.guest_config_saved, d_config); cdcs->dcs.restore_fd = cdcs->dcs.libxc_fd = restore_fd; - if (restore_fd > -1) + if (restore_fd > -1) { cdcs->dcs.restore_params = *params; + rc = libxl__fd_flags_modify_save(gc, cdcs->dcs.restore_fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &cdcs->dcs.restore_fdfl); + if (rc < 0) goto out_err; + } cdcs->dcs.callback = domain_create_cb; libxl__ao_progress_gethow(&cdcs->dcs.aop_console_how, aop_console_how); cdcs->domid_out = domid; @@ -1572,6 +1578,10 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, initiate_domain_create(egc, &cdcs->dcs); return AO_INPROGRESS; + + out_err: + return AO_CREATE_FAIL(rc); + } static void domain_create_cb(libxl__egc *egc, @@ -1579,10 +1589,21 @@ static void domain_create_cb(libxl__egc *egc, int rc, uint32_t domid) { libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); + int flrc; STATE_AO_GC(cdcs->dcs.ao); *cdcs->domid_out = domid; + if (dcs->restore_fd > -1) { + flrc = libxl__fd_flags_restore(gc, + dcs->restore_fd, dcs->restore_fdfl); + /* + * If restore has failed already then report that error not + * this one. + */ + if (flrc && !rc) rc = flrc; + } + libxl__ao_complete(egc, ao, rc); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c3c3b7b..5fa55a7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -631,6 +631,17 @@ _hidden int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]); * `not open'. Ignores any errors. Sets fds[] to -1. */ _hidden void libxl__pipe_close(int fds[2]); +/* Change the flags for the file description associated with fd to + * (flags & mask) | val. + * If r_oldflags != NULL then sets *r_oldflags to the original set of + * flags. + */ +_hidden int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags); +/* Restores the flags for the file description associated with fd to + * to the previous value (returned by libxl__fd_flags_modify_save) + */ +_hidden int libxl__fd_flags_restore(libxl__gc *gc, int fd, int old_flags); /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. @@ -3050,6 +3061,7 @@ struct libxl__domain_suspend_state { uint32_t domid; int fd; + int fdfl; /* original flags on fd */ libxl_domain_type type; int live; int debug; @@ -3391,6 +3403,7 @@ struct libxl__domain_create_state { libxl_domain_config *guest_config; libxl_domain_config guest_config_saved; /* vanilla config */ int restore_fd, libxc_fd; + int restore_fdfl; /* original flags of restore_fd */ libxl_domain_restore_params restore_params; libxl__domain_create_cb *callback; libxl_asyncprogress_how aop_console_how; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKyF-00033u-Gr; Tue, 22 Sep 2015 10:38:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyE-00033d-Ed for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:46 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 58/58-31450-5BF21065; Tue, 22 Sep 2015 10:38:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1442918323!13389939!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17798 invoked from network); 22 Sep 2015 10:38:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyB-0007hI-OP for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyB-0003A9-NO for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:43 +0000 Date: Tue, 22 Sep 2015 10:38:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93f5194e72708776783f2d34894c9b42031e116e Author: Ian Campbell AuthorDate: Fri Sep 11 11:42:51 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 14:42:40 2015 +0100 libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards The fd passed to us by libvirt for both save and restore has at least O_NONBLOCK set, which libxl does not expect and therefore fails to handle any EAGAIN which might arise. This has been observed with migration v2, but if v1 used to work I think that would be just be by luck and/or coincidence. Unix convention (and the principal of least surprise) is usually to ensure that an fd has no "strange" properties, such as being non-blocking, when handing it to another component. However for the convenience of the application arrange instead for libxl to clear any unexpected flags on the file descriptors it is given for save or restore and restore them to their original state at the end. O_NDELAY could be similarly problematic so clear that as well as O_NONBLOCK. To do this introduce a pair of new helper functions one to modify+save the flags and another to restore them and call them in the appropriate places. The migration v1 code appeared to do some things with O_NONBLOCK in the checkpoint case. Migration v2 doesn't seem to do so, and in any case I wouldn't expect it to be relying on libvirt's setting of O_NONBLOCK when xl doesn't use that flag. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu Cc: Jim Fehlig Cc: Andrew Cooper Cc: Shriram Rajagopalan Cc: Yang Hongyang --- tools/libxl/libxl.c | 65 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_create.c | 23 ++++++++++++++- tools/libxl/libxl_internal.h | 13 ++++++++ 3 files changed, 100 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 10d1909..6ebb96e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -952,6 +952,12 @@ static void domain_suspend_cb(libxl__egc *egc, libxl__domain_suspend_state *dss, int rc) { STATE_AO_GC(dss->ao); + int flrc; + + flrc = libxl__fd_flags_restore(gc, dss->fd, dss->fdfl); + /* If suspend has failed already then report that error not this one. */ + if (flrc && !rc) rc = flrc; + libxl__ao_complete(egc,ao,rc); } @@ -980,6 +986,11 @@ int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, dss->live = flags & LIBXL_SUSPEND_LIVE; dss->debug = flags & LIBXL_SUSPEND_DEBUG; + rc = libxl__fd_flags_modify_save(gc, dss->fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &dss->fdfl); + if (rc < 0) goto out_err; + libxl__domain_save(egc, dss); return AO_INPROGRESS; @@ -6507,6 +6518,60 @@ int libxl_fd_set_cloexec(libxl_ctx *ctx, int fd, int cloexec) int libxl_fd_set_nonblock(libxl_ctx *ctx, int fd, int nonblock) { return fd_set_flags(ctx,fd, F_GETFL,F_SETFL,"FL", O_NONBLOCK, nonblock); } +int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags) +{ + int rc, ret, fdfl; + + fdfl = fcntl(fd, F_GETFL); + if (fdfl < 0) { + LOGE(ERROR, "failed to fcntl.F_GETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + + if (r_oldflags) + *r_oldflags = fdfl; + + fdfl &= mask; + fdfl |= val; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; +} + +int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) +{ + int ret, rc; + + LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + + ret = fcntl(fd, F_SETFL, fdfl); + if (ret < 0) { + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + rc = ERROR_FAIL; + goto out_err; + } + + rc = 0; + +out_err: + return rc; + +} void libxl_hwcap_copy(libxl_ctx *ctx,libxl_hwcap *dst, libxl_hwcap *src) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 29c2641..f5771da 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1556,6 +1556,7 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, { AO_CREATE(ctx, 0, ao_how); libxl__app_domain_create_state *cdcs; + int rc; GCNEW(cdcs); cdcs->dcs.ao = ao; @@ -1563,8 +1564,13 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, libxl_domain_config_init(&cdcs->dcs.guest_config_saved); libxl_domain_config_copy(ctx, &cdcs->dcs.guest_config_saved, d_config); cdcs->dcs.restore_fd = cdcs->dcs.libxc_fd = restore_fd; - if (restore_fd > -1) + if (restore_fd > -1) { cdcs->dcs.restore_params = *params; + rc = libxl__fd_flags_modify_save(gc, cdcs->dcs.restore_fd, + ~(O_NONBLOCK|O_NDELAY), 0, + &cdcs->dcs.restore_fdfl); + if (rc < 0) goto out_err; + } cdcs->dcs.callback = domain_create_cb; libxl__ao_progress_gethow(&cdcs->dcs.aop_console_how, aop_console_how); cdcs->domid_out = domid; @@ -1572,6 +1578,10 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, initiate_domain_create(egc, &cdcs->dcs); return AO_INPROGRESS; + + out_err: + return AO_CREATE_FAIL(rc); + } static void domain_create_cb(libxl__egc *egc, @@ -1579,10 +1589,21 @@ static void domain_create_cb(libxl__egc *egc, int rc, uint32_t domid) { libxl__app_domain_create_state *cdcs = CONTAINER_OF(dcs, *cdcs, dcs); + int flrc; STATE_AO_GC(cdcs->dcs.ao); *cdcs->domid_out = domid; + if (dcs->restore_fd > -1) { + flrc = libxl__fd_flags_restore(gc, + dcs->restore_fd, dcs->restore_fdfl); + /* + * If restore has failed already then report that error not + * this one. + */ + if (flrc && !rc) rc = flrc; + } + libxl__ao_complete(egc, ao, rc); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c3c3b7b..5fa55a7 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -631,6 +631,17 @@ _hidden int libxl__pipe_nonblock(libxl_ctx *ctx, int fds[2]); * `not open'. Ignores any errors. Sets fds[] to -1. */ _hidden void libxl__pipe_close(int fds[2]); +/* Change the flags for the file description associated with fd to + * (flags & mask) | val. + * If r_oldflags != NULL then sets *r_oldflags to the original set of + * flags. + */ +_hidden int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, + int mask, int val, int *r_oldflags); +/* Restores the flags for the file description associated with fd to + * to the previous value (returned by libxl__fd_flags_modify_save) + */ +_hidden int libxl__fd_flags_restore(libxl__gc *gc, int fd, int old_flags); /* Each of these logs errors and returns a libxl error code. * They do not mind if path is already removed. @@ -3050,6 +3061,7 @@ struct libxl__domain_suspend_state { uint32_t domid; int fd; + int fdfl; /* original flags on fd */ libxl_domain_type type; int live; int debug; @@ -3391,6 +3403,7 @@ struct libxl__domain_create_state { libxl_domain_config *guest_config; libxl_domain_config guest_config_saved; /* vanilla config */ int restore_fd, libxc_fd; + int restore_fdfl; /* original flags of restore_fd */ libxl_domain_restore_params restore_params; libxl__domain_create_cb *callback; libxl_asyncprogress_how aop_console_how; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKyP-00035Y-JR; Tue, 22 Sep 2015 10:38:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyO-00035N-3X for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:56 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 11/2C-32110-FBF21065; Tue, 22 Sep 2015 10:38:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442918334!36851154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14589 invoked from network); 22 Sep 2015 10:38:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyL-0007hQ-SV for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyL-0003AZ-RY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:53 +0000 Date: Tue, 22 Sep 2015 10:38:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix saved pmtimer and hpet values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 244582a01dcb49fa30083725964a066937cc94f2 Author: Kouya Shimura AuthorDate: Fri Sep 11 16:24:56 2015 +0200 Commit: Jan Beulich CommitDate: Fri Sep 11 16:24:56 2015 +0200 x86/hvm: fix saved pmtimer and hpet values The ACPI PM timer is sometimes broken on live migration. Since vcpu->arch.hvm_vcpu.guest_time is always zero in other than "delay for missed ticks mode". Even in "delay for missed ticks mode", vcpu's guest_time field is not valid (i.e. zero) when the state of vcpu is "blocked". (see pt_save_timer function) The original author (Tim Deegan) of pmtimer_save() must have intended that it saves the last scheduled time of the vcpu. Unfortunately it was already implied this bug. FYI, there is no other timer mode than "delay for missed ticks mode" then. For consistency with HPET, pmtimer_save() should refer hvm_get_guest_time() to update the counter as well as hpet_save() does. Without this patch, the clock of windows server 2012R2 without HPET might leap forward several minutes on live migration. Signed-off-by: Kouya Shimura Retain use of ->arch.hvm_vcpu.guest_time when non-zero. Do the inverse adjustment for vHPET. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Kouya Shimura Release-acked-by: Wei Liu --- xen/arch/x86/hvm/hpet.c | 4 +++- xen/arch/x86/hvm/pmtimer.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index edf9a17..facab83 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -513,11 +513,13 @@ static const struct hvm_mmio_ops hpet_mmio_ops = { static int hpet_save(struct domain *d, hvm_domain_context_t *h) { HPETState *hp = domain_vhpet(d); + struct vcpu *v = pt_global_vcpu_target(d); int rc; uint64_t guest_time; write_lock(&hp->lock); - guest_time = guest_time_hpet(hp); + guest_time = (v->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(v)) / + STIME_PER_HPET_TICK; /* Write the proper value into the main counter */ if ( hpet_enabled(hp) ) diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 07594e1..c8229e0 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -249,10 +249,12 @@ static int pmtimer_save(struct domain *d, hvm_domain_context_t *h) spin_lock(&s->lock); - /* Update the counter to the guest's current time. We always save - * with the domain paused, so the saved time should be after the - * last_gtime, but just in case, make sure we only go forwards */ - x = ((s->vcpu->arch.hvm_vcpu.guest_time - s->last_gtime) * s->scale) >> 32; + /* + * Update the counter to the guest's current time. Make sure it only + * goes forwards. + */ + x = (((s->vcpu->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(s->vcpu)) - + s->last_gtime) * s->scale) >> 32; if ( x < 1UL<<31 ) s->pm.tmr_val += x; if ( (s->pm.tmr_val & TMR_VAL_MSB) != msb ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:38:57 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:38: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 1ZeKyP-00035Y-JR; Tue, 22 Sep 2015 10:38:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyO-00035N-3X for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:56 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 11/2C-32110-FBF21065; Tue, 22 Sep 2015 10:38:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442918334!36851154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14589 invoked from network); 22 Sep 2015 10:38:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:38:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyL-0007hQ-SV for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyL-0003AZ-RY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:38:53 +0000 Date: Tue, 22 Sep 2015 10:38:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix saved pmtimer and hpet values X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 244582a01dcb49fa30083725964a066937cc94f2 Author: Kouya Shimura AuthorDate: Fri Sep 11 16:24:56 2015 +0200 Commit: Jan Beulich CommitDate: Fri Sep 11 16:24:56 2015 +0200 x86/hvm: fix saved pmtimer and hpet values The ACPI PM timer is sometimes broken on live migration. Since vcpu->arch.hvm_vcpu.guest_time is always zero in other than "delay for missed ticks mode". Even in "delay for missed ticks mode", vcpu's guest_time field is not valid (i.e. zero) when the state of vcpu is "blocked". (see pt_save_timer function) The original author (Tim Deegan) of pmtimer_save() must have intended that it saves the last scheduled time of the vcpu. Unfortunately it was already implied this bug. FYI, there is no other timer mode than "delay for missed ticks mode" then. For consistency with HPET, pmtimer_save() should refer hvm_get_guest_time() to update the counter as well as hpet_save() does. Without this patch, the clock of windows server 2012R2 without HPET might leap forward several minutes on live migration. Signed-off-by: Kouya Shimura Retain use of ->arch.hvm_vcpu.guest_time when non-zero. Do the inverse adjustment for vHPET. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Kouya Shimura Release-acked-by: Wei Liu --- xen/arch/x86/hvm/hpet.c | 4 +++- xen/arch/x86/hvm/pmtimer.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hpet.c b/xen/arch/x86/hvm/hpet.c index edf9a17..facab83 100644 --- a/xen/arch/x86/hvm/hpet.c +++ b/xen/arch/x86/hvm/hpet.c @@ -513,11 +513,13 @@ static const struct hvm_mmio_ops hpet_mmio_ops = { static int hpet_save(struct domain *d, hvm_domain_context_t *h) { HPETState *hp = domain_vhpet(d); + struct vcpu *v = pt_global_vcpu_target(d); int rc; uint64_t guest_time; write_lock(&hp->lock); - guest_time = guest_time_hpet(hp); + guest_time = (v->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(v)) / + STIME_PER_HPET_TICK; /* Write the proper value into the main counter */ if ( hpet_enabled(hp) ) diff --git a/xen/arch/x86/hvm/pmtimer.c b/xen/arch/x86/hvm/pmtimer.c index 07594e1..c8229e0 100644 --- a/xen/arch/x86/hvm/pmtimer.c +++ b/xen/arch/x86/hvm/pmtimer.c @@ -249,10 +249,12 @@ static int pmtimer_save(struct domain *d, hvm_domain_context_t *h) spin_lock(&s->lock); - /* Update the counter to the guest's current time. We always save - * with the domain paused, so the saved time should be after the - * last_gtime, but just in case, make sure we only go forwards */ - x = ((s->vcpu->arch.hvm_vcpu.guest_time - s->last_gtime) * s->scale) >> 32; + /* + * Update the counter to the guest's current time. Make sure it only + * goes forwards. + */ + x = (((s->vcpu->arch.hvm_vcpu.guest_time ?: hvm_get_guest_time(s->vcpu)) - + s->last_gtime) * s->scale) >> 32; if ( x < 1UL<<31 ) s->pm.tmr_val += x; if ( (s->pm.tmr_val & TMR_VAL_MSB) != msb ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKyZ-00037b-Nq; Tue, 22 Sep 2015 10:39:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyY-00037L-MV for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:06 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 6C/E5-25435-ACF21065; Tue, 22 Sep 2015 10:39:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1442918344!19042815!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7923 invoked from network); 22 Sep 2015 10:39:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyW-0007i4-29 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyV-0003B4-WA for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:04 +0000 Date: Tue, 22 Sep 2015 10:39:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: format fd flags with 0x since they are hex. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4b717808f4bead160008ba653ed4e6b05831a71 Author: Ian Campbell AuthorDate: Fri Sep 11 15:19:54 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 15:57:45 2015 +0100 libxl: format fd flags with 0x since they are hex. Commit 93f5194e7270 "libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards" added some logging of fcntl.F_GETFL at all as %x without a 0x prefix to make it clear they numbers are hex. Fix this alongwith an inadvertent logging of the fd itself as hex. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 6ebb96e..4d27891 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6530,7 +6530,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, goto out_err; } - LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are 0x%x", fd, fdfl); if (r_oldflags) *r_oldflags = fdfl; @@ -6538,7 +6538,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, fdfl &= mask; fdfl |= val; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { @@ -6557,11 +6557,11 @@ int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) { int ret, rc; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { - LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); rc = ERROR_FAIL; goto out_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 Tue Sep 22 10:39:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKyZ-00037b-Nq; Tue, 22 Sep 2015 10:39:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyY-00037L-MV for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:06 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 6C/E5-25435-ACF21065; Tue, 22 Sep 2015 10:39:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1442918344!19042815!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7923 invoked from network); 22 Sep 2015 10:39:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyW-0007i4-29 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyV-0003B4-WA for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:04 +0000 Date: Tue, 22 Sep 2015 10:39:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: format fd flags with 0x since they are hex. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4b717808f4bead160008ba653ed4e6b05831a71 Author: Ian Campbell AuthorDate: Fri Sep 11 15:19:54 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 15:57:45 2015 +0100 libxl: format fd flags with 0x since they are hex. Commit 93f5194e7270 "libxl: clear O_NONBLOCK|O_NDELAY on migration fd and reinstate afterwards" added some logging of fcntl.F_GETFL at all as %x without a 0x prefix to make it clear they numbers are hex. Fix this alongwith an inadvertent logging of the fd itself as hex. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/libxl/libxl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 6ebb96e..4d27891 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6530,7 +6530,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, goto out_err; } - LOG(DEBUG, "fnctl F_GETFL flags for fd %d are %x", fd, fdfl); + LOG(DEBUG, "fnctl F_GETFL flags for fd %d are 0x%x", fd, fdfl); if (r_oldflags) *r_oldflags = fdfl; @@ -6538,7 +6538,7 @@ int libxl__fd_flags_modify_save(libxl__gc *gc, int fd, fdfl &= mask; fdfl |= val; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { @@ -6557,11 +6557,11 @@ int libxl__fd_flags_restore(libxl__gc *gc, int fd, int fdfl) { int ret, rc; - LOG(DEBUG, "fnctl F_SETFL of fd %d to %x", fd, fdfl); + LOG(DEBUG, "fnctl F_SETFL of fd %d to 0x%x", fd, fdfl); ret = fcntl(fd, F_SETFL, fdfl); if (ret < 0) { - LOGE(ERROR, "failed to fcntl.F_SETFL for fd %x", fd); + LOGE(ERROR, "failed to fcntl.F_SETFL for fd %d", fd); rc = ERROR_FAIL; goto out_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 Tue Sep 22 10:39:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyn-0003A2-Qe; Tue, 22 Sep 2015 10:39:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyi-00039P-Nr for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:20 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 5B/2D-16618-4DF21065; Tue, 22 Sep 2015 10:39:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1442918354!40510197!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13271 invoked from network); 22 Sep 2015 10:39:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyg-0007iC-74 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyg-0003BT-5X for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:14 +0000 Date: Tue, 22 Sep 2015 10:39:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: introduce xc_domain_getvnuma X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 818f445e71f3ec7819d2e7ed23fa3ecb2fed4054 Author: Wei Liu AuthorDate: Fri Sep 11 14:50:07 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:19:23 2015 +0100 libxc: introduce xc_domain_getvnuma A simple wrapper for XENMEM_get_vnumainfo. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 18 ++++++++++++++ tools/libxc/xc_domain.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index e019474..3482544 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1287,6 +1287,24 @@ int xc_domain_setvnuma(xc_interface *xch, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); +/* + * Retrieve vnuma configuration + * domid: IN, target domid + * nr_vnodes: IN/OUT, number of vnodes, not NULL + * nr_vmemranges: IN/OUT, number of vmemranges, not NULL + * nr_vcpus: IN/OUT, number of vcpus, not NULL + * vmemranges: OUT, an array which has length of nr_vmemranges + * vdistance: OUT, an array which has length of nr_vnodes * nr_vnodes + * vcpu_to_vnode: OUT, an array which has length of nr_vcpus + */ +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode); int xc_domain_soft_reset(xc_interface *xch, uint32_t domid); diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 62b2e45..e7278dd 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2493,6 +2493,59 @@ int xc_domain_setvnuma(xc_interface *xch, return rc; } +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode) +{ + int rc; + DECLARE_HYPERCALL_BOUNCE(vmemrange, sizeof(*vmemrange) * *nr_vmemranges, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vdistance, sizeof(*vdistance) * + *nr_vnodes * *nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vcpu_to_vnode, sizeof(*vcpu_to_vnode) * *nr_vcpus, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + + struct xen_vnuma_topology_info vnuma_topo; + + if ( xc_hypercall_bounce_pre(xch, vmemrange) || + xc_hypercall_bounce_pre(xch, vdistance) || + xc_hypercall_bounce_pre(xch, vcpu_to_vnode) ) + { + rc = -1; + errno = ENOMEM; + goto vnumaget_fail; + } + + set_xen_guest_handle(vnuma_topo.vmemrange.h, vmemrange); + set_xen_guest_handle(vnuma_topo.vdistance.h, vdistance); + set_xen_guest_handle(vnuma_topo.vcpu_to_vnode.h, vcpu_to_vnode); + + vnuma_topo.nr_vnodes = *nr_vnodes; + vnuma_topo.nr_vcpus = *nr_vcpus; + vnuma_topo.nr_vmemranges = *nr_vmemranges; + vnuma_topo.domid = domid; + vnuma_topo.pad = 0; + + rc = do_memory_op(xch, XENMEM_get_vnumainfo, &vnuma_topo, + sizeof(vnuma_topo)); + + *nr_vnodes = vnuma_topo.nr_vnodes; + *nr_vcpus = vnuma_topo.nr_vcpus; + *nr_vmemranges = vnuma_topo.nr_vmemranges; + + vnumaget_fail: + xc_hypercall_bounce_post(xch, vmemrange); + xc_hypercall_bounce_post(xch, vdistance); + xc_hypercall_bounce_post(xch, vcpu_to_vnode); + + return rc; +} int xc_domain_soft_reset(xc_interface *xch, uint32_t domid) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyn-0003A2-Qe; Tue, 22 Sep 2015 10:39:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyi-00039P-Nr for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:20 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 5B/2D-16618-4DF21065; Tue, 22 Sep 2015 10:39:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1442918354!40510197!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13271 invoked from network); 22 Sep 2015 10:39:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyg-0007iC-74 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyg-0003BT-5X for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:14 +0000 Date: Tue, 22 Sep 2015 10:39:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: introduce xc_domain_getvnuma X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 818f445e71f3ec7819d2e7ed23fa3ecb2fed4054 Author: Wei Liu AuthorDate: Fri Sep 11 14:50:07 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:19:23 2015 +0100 libxc: introduce xc_domain_getvnuma A simple wrapper for XENMEM_get_vnumainfo. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 18 ++++++++++++++ tools/libxc/xc_domain.c | 53 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index e019474..3482544 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1287,6 +1287,24 @@ int xc_domain_setvnuma(xc_interface *xch, unsigned int *vdistance, unsigned int *vcpu_to_vnode, unsigned int *vnode_to_pnode); +/* + * Retrieve vnuma configuration + * domid: IN, target domid + * nr_vnodes: IN/OUT, number of vnodes, not NULL + * nr_vmemranges: IN/OUT, number of vmemranges, not NULL + * nr_vcpus: IN/OUT, number of vcpus, not NULL + * vmemranges: OUT, an array which has length of nr_vmemranges + * vdistance: OUT, an array which has length of nr_vnodes * nr_vnodes + * vcpu_to_vnode: OUT, an array which has length of nr_vcpus + */ +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode); int xc_domain_soft_reset(xc_interface *xch, uint32_t domid); diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 62b2e45..e7278dd 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2493,6 +2493,59 @@ int xc_domain_setvnuma(xc_interface *xch, return rc; } +int xc_domain_getvnuma(xc_interface *xch, + uint32_t domid, + uint32_t *nr_vnodes, + uint32_t *nr_vmemranges, + uint32_t *nr_vcpus, + xen_vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode) +{ + int rc; + DECLARE_HYPERCALL_BOUNCE(vmemrange, sizeof(*vmemrange) * *nr_vmemranges, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vdistance, sizeof(*vdistance) * + *nr_vnodes * *nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + DECLARE_HYPERCALL_BOUNCE(vcpu_to_vnode, sizeof(*vcpu_to_vnode) * *nr_vcpus, + XC_HYPERCALL_BUFFER_BOUNCE_OUT); + + struct xen_vnuma_topology_info vnuma_topo; + + if ( xc_hypercall_bounce_pre(xch, vmemrange) || + xc_hypercall_bounce_pre(xch, vdistance) || + xc_hypercall_bounce_pre(xch, vcpu_to_vnode) ) + { + rc = -1; + errno = ENOMEM; + goto vnumaget_fail; + } + + set_xen_guest_handle(vnuma_topo.vmemrange.h, vmemrange); + set_xen_guest_handle(vnuma_topo.vdistance.h, vdistance); + set_xen_guest_handle(vnuma_topo.vcpu_to_vnode.h, vcpu_to_vnode); + + vnuma_topo.nr_vnodes = *nr_vnodes; + vnuma_topo.nr_vcpus = *nr_vcpus; + vnuma_topo.nr_vmemranges = *nr_vmemranges; + vnuma_topo.domid = domid; + vnuma_topo.pad = 0; + + rc = do_memory_op(xch, XENMEM_get_vnumainfo, &vnuma_topo, + sizeof(vnuma_topo)); + + *nr_vnodes = vnuma_topo.nr_vnodes; + *nr_vcpus = vnuma_topo.nr_vcpus; + *nr_vmemranges = vnuma_topo.nr_vmemranges; + + vnumaget_fail: + xc_hypercall_bounce_post(xch, vmemrange); + xc_hypercall_bounce_post(xch, vdistance); + xc_hypercall_bounce_post(xch, vcpu_to_vnode); + + return rc; +} int xc_domain_soft_reset(xc_interface *xch, uint32_t domid) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKyt-0003BP-TK; Tue, 22 Sep 2015 10:39:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKys-0003B9-Va for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:27 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id B5/A0-18886-EDF21065; Tue, 22 Sep 2015 10:39:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442918364!49536720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12334 invoked from network); 22 Sep 2015 10:39: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; 22 Sep 2015 10:39:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyq-0007iH-Br for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyq-0003Bp-At for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:24 +0000 Date: Tue, 22 Sep 2015 10:39:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl/libxl: disallow saving a guest with vNUMA configured X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa6b5490be0bf2c0d1c17197e9c30af22e0a24e9 Author: Wei Liu AuthorDate: Wed Sep 9 17:11:24 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:22:03 2015 +0100 xl/libxl: disallow saving a guest with vNUMA configured This is because the migration stream does not preserve node information. Note this is not a regression for migration v2 vs legacy migration because neither of them preserves node information. Signed-off-by: Wei Liu Acked-by: Ian Campbell [ ijc -- some grammar fixes to the doc and fixed a comment ] --- docs/man/xl.cfg.pod.5 | 2 ++ tools/libxl/libxl_dom.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c6345b8..db4a163 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -263,6 +263,8 @@ virtual node. Note that virtual NUMA for PV guest is not yet supported, because there is an issue with cpuid handling that affects PV virtual NUMA. +Furthermore, guests with virtual NUMA cannot be saved or migrated +because the migration stream does not preserve node information. Each B is a list, which has a form of "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]" (without quotes). diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c2518a3..b514377 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -24,6 +24,7 @@ #include #include #include +#include libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) { @@ -1602,7 +1603,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); int port; - int rc; + int rc, ret; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1612,6 +1613,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) const libxl_domain_remus_info *const r_info = dss->remus; libxl__srm_save_autogen_callbacks *const callbacks = &dss->sws.shs.callbacks.save.a; + unsigned int nr_vnodes = 0, nr_vmemranges = 0, nr_vcpus = 0; dss->rc = 0; logdirty_init(&dss->logdirty); @@ -1636,6 +1638,21 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) | (debug ? XCFLAGS_DEBUG : 0) | (dss->hvm ? XCFLAGS_HVM : 0); + /* Disallow saving a guest with vNUMA configured because migration + * stream does not preserve node information. + * + * Reject any domain which has vnuma enabled, even if the + * configuration is empty. Only domains which have no vnuma + * configuration at all are supported. + */ + ret = xc_domain_getvnuma(CTX->xch, domid, &nr_vnodes, &nr_vmemranges, + &nr_vcpus, NULL, NULL, NULL); + if (ret != -1 || errno != XEN_EOPNOTSUPP) { + LOG(ERROR, "Cannot save a guest with vNUMA configured"); + rc = ERROR_FAIL; + goto out; + } + dss->guest_evtchn.port = -1; dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKyt-0003BP-TK; Tue, 22 Sep 2015 10:39:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKys-0003B9-Va for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:27 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id B5/A0-18886-EDF21065; Tue, 22 Sep 2015 10:39:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1442918364!49536720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12334 invoked from network); 22 Sep 2015 10:39: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; 22 Sep 2015 10:39:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKyq-0007iH-Br for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKyq-0003Bp-At for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:24 +0000 Date: Tue, 22 Sep 2015 10:39:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl/libxl: disallow saving a guest with vNUMA configured X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa6b5490be0bf2c0d1c17197e9c30af22e0a24e9 Author: Wei Liu AuthorDate: Wed Sep 9 17:11:24 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:22:03 2015 +0100 xl/libxl: disallow saving a guest with vNUMA configured This is because the migration stream does not preserve node information. Note this is not a regression for migration v2 vs legacy migration because neither of them preserves node information. Signed-off-by: Wei Liu Acked-by: Ian Campbell [ ijc -- some grammar fixes to the doc and fixed a comment ] --- docs/man/xl.cfg.pod.5 | 2 ++ tools/libxl/libxl_dom.c | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index c6345b8..db4a163 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -263,6 +263,8 @@ virtual node. Note that virtual NUMA for PV guest is not yet supported, because there is an issue with cpuid handling that affects PV virtual NUMA. +Furthermore, guests with virtual NUMA cannot be saved or migrated +because the migration stream does not preserve node information. Each B is a list, which has a form of "[VNODE_CONFIG_OPTION,VNODE_CONFIG_OPTION, ... ]" (without quotes). diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c2518a3..b514377 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -24,6 +24,7 @@ #include #include #include +#include libxl_domain_type libxl__domain_type(libxl__gc *gc, uint32_t domid) { @@ -1602,7 +1603,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) { STATE_AO_GC(dss->ao); int port; - int rc; + int rc, ret; /* Convenience aliases */ const uint32_t domid = dss->domid; @@ -1612,6 +1613,7 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) const libxl_domain_remus_info *const r_info = dss->remus; libxl__srm_save_autogen_callbacks *const callbacks = &dss->sws.shs.callbacks.save.a; + unsigned int nr_vnodes = 0, nr_vmemranges = 0, nr_vcpus = 0; dss->rc = 0; logdirty_init(&dss->logdirty); @@ -1636,6 +1638,21 @@ void libxl__domain_save(libxl__egc *egc, libxl__domain_suspend_state *dss) | (debug ? XCFLAGS_DEBUG : 0) | (dss->hvm ? XCFLAGS_HVM : 0); + /* Disallow saving a guest with vNUMA configured because migration + * stream does not preserve node information. + * + * Reject any domain which has vnuma enabled, even if the + * configuration is empty. Only domains which have no vnuma + * configuration at all are supported. + */ + ret = xc_domain_getvnuma(CTX->xch, domid, &nr_vnodes, &nr_vmemranges, + &nr_vcpus, NULL, NULL, NULL); + if (ret != -1 || errno != XEN_EOPNOTSUPP) { + LOG(ERROR, "Cannot save a guest with vNUMA configured"); + rc = ERROR_FAIL; + goto out; + } + dss->guest_evtchn.port = -1; dss->guest_evtchn_lockfd = -1; dss->guest_responded = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKz3-0003DN-Vy; Tue, 22 Sep 2015 10:39:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKz2-0003D1-O3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:36 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 61/5E-29649-8EF21065; Tue, 22 Sep 2015 10:39:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442918374!46367698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28884 invoked from network); 22 Sep 2015 10:39:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKz0-0007iS-Gi for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKz0-0003Cu-FX for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:34 +0000 Date: Tue, 22 Sep 2015 10:39:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: handle empty vnuma configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebe3fd9e736dda6cb141abe1241f0c8491125ebc Author: Wei Liu AuthorDate: Fri Sep 11 14:50:09 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:31:11 2015 +0100 xl: handle empty vnuma configuration When user specifies vnuma = [], we need to skip the whole parser function, otherwise the parser sets b_info->max_memkb to garbage value. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index c9bd839..bfbd421 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1093,6 +1093,9 @@ static void parse_vnuma_config(const XLU_Config *config, if (xlu_cfg_get_list(config, "vnuma", &vnuma, &num_vnuma, 1)) return; + if (!num_vnuma) + return; + b_info->num_vnuma_nodes = num_vnuma; b_info->vnuma_nodes = xcalloc(num_vnuma, sizeof(libxl_vnode_info)); vcpu_parsed = xcalloc(num_vnuma, sizeof(libxl_bitmap)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKz3-0003DN-Vy; Tue, 22 Sep 2015 10:39:37 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKz2-0003D1-O3 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:36 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 61/5E-29649-8EF21065; Tue, 22 Sep 2015 10:39:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1442918374!46367698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28884 invoked from network); 22 Sep 2015 10:39:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKz0-0007iS-Gi for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKz0-0003Cu-FX for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:34 +0000 Date: Tue, 22 Sep 2015 10:39:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: handle empty vnuma configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebe3fd9e736dda6cb141abe1241f0c8491125ebc Author: Wei Liu AuthorDate: Fri Sep 11 14:50:09 2015 +0100 Commit: Ian Campbell CommitDate: Fri Sep 11 16:31:11 2015 +0100 xl: handle empty vnuma configuration When user specifies vnuma = [], we need to skip the whole parser function, otherwise the parser sets b_info->max_memkb to garbage value. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index c9bd839..bfbd421 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1093,6 +1093,9 @@ static void parse_vnuma_config(const XLU_Config *config, if (xlu_cfg_get_list(config, "vnuma", &vnuma, &num_vnuma, 1)) return; + if (!num_vnuma) + return; + b_info->num_vnuma_nodes = num_vnuma; b_info->vnuma_nodes = xcalloc(num_vnuma, sizeof(libxl_vnode_info)); vcpu_parsed = xcalloc(num_vnuma, sizeof(libxl_bitmap)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKzF-0003FP-2F; Tue, 22 Sep 2015 10:39:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzD-0003F9-Ok for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:47 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 7D/58-22089-3FF21065; Tue, 22 Sep 2015 10:39:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1442918385!36851148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3179 invoked from network); 22 Sep 2015 10:39:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzB-0007ia-Ig for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzA-0003DG-KR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:44 +0000 Date: Tue, 22 Sep 2015 10:39:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd/iommu: permit group devices to passthrough in relaxed 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 3848058e7dd66dc35b232a029fcbde55f3eb872f Author: Tiejun Chen AuthorDate: Mon Sep 14 13:38:02 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:38:02 2015 +0200 vtd/iommu: permit group devices to passthrough in relaxed mode Currently we don't allow passing through any group devices which are sharing same RMRR entry since it would break security among VMs. And indeed, we expect we can figure out a better way to handle this kind of case completely. But before the group assignment gets implemented, we might make this permission dependent on our RMRR policy. So, now it would be allowed in the relaxed mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian Release-acked-by: Wei Liu --- xen/drivers/passthrough/vtd/iommu.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 836aed5..7b45bff 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2297,7 +2297,9 @@ static int intel_iommu_assign_device( /* * In rare cases one given rmrr is shared by multiple devices but * obviously this would put the security of a system at risk. So - * we should prevent from this sort of device assignment. + * we would prevent from this sort of device assignment. But this + * can be permitted if user set + * "pci = [ 'sbdf, rdm_policy=relaxed' ]" * * TODO: in the future we can introduce group device assignment * interface to make sure devices sharing RMRR are assigned to the @@ -2310,12 +2312,16 @@ static int intel_iommu_assign_device( PCI_DEVFN2(bdf) == devfn && rmrr->scope.devices_cnt > 1 ) { - printk(XENLOG_G_ERR VTDPREFIX - " cannot assign %04x:%02x:%02x.%u" + bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); + + printk(XENLOG_G_WARNING VTDPREFIX + " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); - return -EPERM; + if ( !relaxed ) + return -EPERM; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKzF-0003FP-2F; Tue, 22 Sep 2015 10:39:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzD-0003F9-Ok for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:47 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 7D/58-22089-3FF21065; Tue, 22 Sep 2015 10:39:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1442918385!36851148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3179 invoked from network); 22 Sep 2015 10:39:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzB-0007ia-Ig for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzA-0003DG-KR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:44 +0000 Date: Tue, 22 Sep 2015 10:39:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd/iommu: permit group devices to passthrough in relaxed 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 3848058e7dd66dc35b232a029fcbde55f3eb872f Author: Tiejun Chen AuthorDate: Mon Sep 14 13:38:02 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:38:02 2015 +0200 vtd/iommu: permit group devices to passthrough in relaxed mode Currently we don't allow passing through any group devices which are sharing same RMRR entry since it would break security among VMs. And indeed, we expect we can figure out a better way to handle this kind of case completely. But before the group assignment gets implemented, we might make this permission dependent on our RMRR policy. So, now it would be allowed in the relaxed mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian Release-acked-by: Wei Liu --- xen/drivers/passthrough/vtd/iommu.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 836aed5..7b45bff 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2297,7 +2297,9 @@ static int intel_iommu_assign_device( /* * In rare cases one given rmrr is shared by multiple devices but * obviously this would put the security of a system at risk. So - * we should prevent from this sort of device assignment. + * we would prevent from this sort of device assignment. But this + * can be permitted if user set + * "pci = [ 'sbdf, rdm_policy=relaxed' ]" * * TODO: in the future we can introduce group device assignment * interface to make sure devices sharing RMRR are assigned to the @@ -2310,12 +2312,16 @@ static int intel_iommu_assign_device( PCI_DEVFN2(bdf) == devfn && rmrr->scope.devices_cnt > 1 ) { - printk(XENLOG_G_ERR VTDPREFIX - " cannot assign %04x:%02x:%02x.%u" + bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); + + printk(XENLOG_G_WARNING VTDPREFIX + " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); - return -EPERM; + if ( !relaxed ) + return -EPERM; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKzP-0003HR-4k; Tue, 22 Sep 2015 10:39:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzN-0003HE-W2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:58 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id C9/8E-16618-DFF21065; Tue, 22 Sep 2015 10:39:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1442918395!33159407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2269 invoked from network); 22 Sep 2015 10:39:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzL-0007ii-Mg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzL-0003Dc-Le for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:55 +0000 Date: Tue, 22 Sep 2015 10:39:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: fix mismatched unlock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f180822ad3fe83fe293393ec175f14ded98f082 Author: Jan Beulich AuthorDate: Mon Sep 14 13:39:19 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:39:19 2015 +0200 x86/p2m: fix mismatched unlock Luckily, due to gfn_unlock() currently mapping to p2m_unlock(), this is only a cosmetic issue right now. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Release-acked-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index c4329d2..e1d930a 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -913,7 +913,7 @@ static int set_typed_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, NULL, NULL); if ( p2m_is_grant(ot) || p2m_is_foreign(ot) ) { - p2m_unlock(p2m); + gfn_unlock(p2m, gfn, 0); domain_crash(d); return -ENOENT; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:39:59 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:39: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 1ZeKzP-0003HR-4k; Tue, 22 Sep 2015 10:39:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzN-0003HE-W2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:58 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id C9/8E-16618-DFF21065; Tue, 22 Sep 2015 10:39:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1442918395!33159407!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2269 invoked from network); 22 Sep 2015 10:39:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:39:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzL-0007ii-Mg for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzL-0003Dc-Le for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:39:55 +0000 Date: Tue, 22 Sep 2015 10:39:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: fix mismatched unlock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1f180822ad3fe83fe293393ec175f14ded98f082 Author: Jan Beulich AuthorDate: Mon Sep 14 13:39:19 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:39:19 2015 +0200 x86/p2m: fix mismatched unlock Luckily, due to gfn_unlock() currently mapping to p2m_unlock(), this is only a cosmetic issue right now. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper Reviewed-by: George Dunlap Release-acked-by: Wei Liu --- xen/arch/x86/mm/p2m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index c4329d2..e1d930a 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -913,7 +913,7 @@ static int set_typed_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, NULL, NULL); if ( p2m_is_grant(ot) || p2m_is_foreign(ot) ) { - p2m_unlock(p2m); + gfn_unlock(p2m, gfn, 0); domain_crash(d); return -ENOENT; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeKza-0003Iy-7D; Tue, 22 Sep 2015 10:40:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzY-0003Iq-G1 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:08 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 03/F7-19110-70031065; Tue, 22 Sep 2015 10:40:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1442918406!51863160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12358 invoked from network); 22 Sep 2015 10:40:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzV-0007jO-SI for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzV-0003F8-Qn for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:05 +0000 Date: Tue, 22 Sep 2015 10:40:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PoD: use clear_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 486252f8a86bca36c7c737a25d95327def7a1af3 Author: Jan Beulich AuthorDate: Mon Sep 14 13:40:04 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:40:04 2015 +0200 x86/PoD: use clear_domain_page() Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/arch/x86/mm/p2m-pod.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 8156525..026d455 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -107,11 +107,7 @@ p2m_pod_cache_add(struct p2m_domain *p2m, * promise to provide zero pages. So we scrub pages before using. */ for ( i = 0; i < (1 << order); i++ ) - { - char *b = map_domain_page(_mfn(mfn_x(page_to_mfn(page)) + i)); - clear_page(b); - unmap_domain_page(b); - } + clear_domain_page(_mfn(mfn_x(page_to_mfn(page)) + i)); /* First, take all pages off the domain list */ lock_page_alloc(p2m); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeKza-0003Iy-7D; Tue, 22 Sep 2015 10:40:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzY-0003Iq-G1 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:08 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 03/F7-19110-70031065; Tue, 22 Sep 2015 10:40:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1442918406!51863160!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12358 invoked from network); 22 Sep 2015 10:40:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzV-0007jO-SI for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzV-0003F8-Qn for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:05 +0000 Date: Tue, 22 Sep 2015 10:40:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PoD: use clear_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 486252f8a86bca36c7c737a25d95327def7a1af3 Author: Jan Beulich AuthorDate: Mon Sep 14 13:40:04 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 14 13:40:04 2015 +0200 x86/PoD: use clear_domain_page() Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/arch/x86/mm/p2m-pod.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 8156525..026d455 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -107,11 +107,7 @@ p2m_pod_cache_add(struct p2m_domain *p2m, * promise to provide zero pages. So we scrub pages before using. */ for ( i = 0; i < (1 << order); i++ ) - { - char *b = map_domain_page(_mfn(mfn_x(page_to_mfn(page)) + i)); - clear_page(b); - unmap_domain_page(b); - } + clear_domain_page(_mfn(mfn_x(page_to_mfn(page)) + i)); /* First, take all pages off the domain list */ lock_page_alloc(p2m); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeKzk-0003Kj-BV; Tue, 22 Sep 2015 10:40:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzi-0003KY-RW for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:19 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 87/4D-14422-11031065; Tue, 22 Sep 2015 10:40:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1442918416!36844487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18939 invoked from network); 22 Sep 2015 10:40:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzg-0007jW-3D for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzg-0003Ff-0r for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:16 +0000 Date: Tue, 22 Sep 2015 10:40:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: slightly refine pci-assignable-{add, remove} 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 6e1e3480c3878bac5d244925974a6852c47c809b Author: Jan Beulich AuthorDate: Thu Sep 10 06:36:54 2015 -0600 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:26 2015 +0100 libxl: slightly refine pci-assignable-{add, remove} handling While it appears to be intentional for "xl pci-assignable-remove" to not re-bind the original driver by default (requires the -r option), permanently losing the information which driver was originally used seems bad. Make "add; remove; add; remove -r" re-bind the original driver by allowing "remove" to delete the information only upon successful re-bind. In the course of this I also noticed that binding information is lost when upon first "add" pciback isn't loaded yet, due to its presence not being checked for early enough. Adjust pciback_dev_is_assigned() accordingly, and properly distinguish "yes" and "error" returns in the "add" case (removing a redundant error message from the "remove" path for consistency). Signed-off-by: Jan Beulich Reviewed-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 1ebdce7..bb54426 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -543,6 +543,17 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pcidev) int rc; struct stat st; + if ( access(SYSFS_PCIBACK_DRIVER, F_OK) < 0 ) { + if ( errno == ENOENT ) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Looks like pciback driver is not loaded"); + } else { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Can't access "SYSFS_PCIBACK_DRIVER); + } + return -1; + } + spath = libxl__sprintf(gc, SYSFS_PCIBACK_DRIVER"/"PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); @@ -658,6 +669,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, libxl_ctx *ctx = libxl__gc_owner(gc); unsigned dom, bus, dev, func; char *spath, *driver_path = NULL; + int rc; struct stat st; /* Local copy for convenience */ @@ -674,7 +686,11 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, } /* Check to see if it's already assigned to pciback */ - if ( pciback_dev_is_assigned(gc, pcidev) ) { + rc = pciback_dev_is_assigned(gc, pcidev); + if ( rc < 0 ) { + return ERROR_FAIL; + } + if ( rc ) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, PCI_BDF" already assigned to pciback", dom, bus, dev, func); return 0; @@ -692,11 +708,18 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, if ( rebind ) { if ( driver_path ) { pci_assignable_driver_path_write(gc, pcidev, driver_path); + } else if ( (driver_path = + pci_assignable_driver_path_read(gc, pcidev)) != NULL ) { + LIBXL__LOG(ctx, LIBXL__LOG_INFO, + PCI_BDF" not bound to a driver, will be rebound to %s", + dom, bus, dev, func, driver_path); } else { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, PCI_BDF" not bound to a driver, will not be rebound.", dom, bus, dev, func); } + } else { + pci_assignable_driver_path_remove(gc, pcidev); } if ( pciback_dev_assign(gc, pcidev) ) { @@ -717,7 +740,6 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc, /* Unbind from pciback */ if ( (rc=pciback_dev_is_assigned(gc, pcidev)) < 0 ) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Checking if pciback was assigned"); return ERROR_FAIL; } else if ( rc ) { pciback_dev_unassign(gc, pcidev); @@ -741,9 +763,9 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc, "Couldn't bind device to %s", driver_path); return -1; } - } - pci_assignable_driver_path_remove(gc, pcidev); + pci_assignable_driver_path_remove(gc, pcidev); + } } else { if ( rebind ) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeKzk-0003Kj-BV; Tue, 22 Sep 2015 10:40:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzi-0003KY-RW for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:19 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 87/4D-14422-11031065; Tue, 22 Sep 2015 10:40:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1442918416!36844487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18939 invoked from network); 22 Sep 2015 10:40:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzg-0007jW-3D for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzg-0003Ff-0r for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:16 +0000 Date: Tue, 22 Sep 2015 10:40:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: slightly refine pci-assignable-{add, remove} 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 6e1e3480c3878bac5d244925974a6852c47c809b Author: Jan Beulich AuthorDate: Thu Sep 10 06:36:54 2015 -0600 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:26 2015 +0100 libxl: slightly refine pci-assignable-{add, remove} handling While it appears to be intentional for "xl pci-assignable-remove" to not re-bind the original driver by default (requires the -r option), permanently losing the information which driver was originally used seems bad. Make "add; remove; add; remove -r" re-bind the original driver by allowing "remove" to delete the information only upon successful re-bind. In the course of this I also noticed that binding information is lost when upon first "add" pciback isn't loaded yet, due to its presence not being checked for early enough. Adjust pciback_dev_is_assigned() accordingly, and properly distinguish "yes" and "error" returns in the "add" case (removing a redundant error message from the "remove" path for consistency). Signed-off-by: Jan Beulich Reviewed-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 1ebdce7..bb54426 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -543,6 +543,17 @@ static int pciback_dev_is_assigned(libxl__gc *gc, libxl_device_pci *pcidev) int rc; struct stat st; + if ( access(SYSFS_PCIBACK_DRIVER, F_OK) < 0 ) { + if ( errno == ENOENT ) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Looks like pciback driver is not loaded"); + } else { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "Can't access "SYSFS_PCIBACK_DRIVER); + } + return -1; + } + spath = libxl__sprintf(gc, SYSFS_PCIBACK_DRIVER"/"PCI_BDF, pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); @@ -658,6 +669,7 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, libxl_ctx *ctx = libxl__gc_owner(gc); unsigned dom, bus, dev, func; char *spath, *driver_path = NULL; + int rc; struct stat st; /* Local copy for convenience */ @@ -674,7 +686,11 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, } /* Check to see if it's already assigned to pciback */ - if ( pciback_dev_is_assigned(gc, pcidev) ) { + rc = pciback_dev_is_assigned(gc, pcidev); + if ( rc < 0 ) { + return ERROR_FAIL; + } + if ( rc ) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, PCI_BDF" already assigned to pciback", dom, bus, dev, func); return 0; @@ -692,11 +708,18 @@ static int libxl__device_pci_assignable_add(libxl__gc *gc, if ( rebind ) { if ( driver_path ) { pci_assignable_driver_path_write(gc, pcidev, driver_path); + } else if ( (driver_path = + pci_assignable_driver_path_read(gc, pcidev)) != NULL ) { + LIBXL__LOG(ctx, LIBXL__LOG_INFO, + PCI_BDF" not bound to a driver, will be rebound to %s", + dom, bus, dev, func, driver_path); } else { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, PCI_BDF" not bound to a driver, will not be rebound.", dom, bus, dev, func); } + } else { + pci_assignable_driver_path_remove(gc, pcidev); } if ( pciback_dev_assign(gc, pcidev) ) { @@ -717,7 +740,6 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc, /* Unbind from pciback */ if ( (rc=pciback_dev_is_assigned(gc, pcidev)) < 0 ) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Checking if pciback was assigned"); return ERROR_FAIL; } else if ( rc ) { pciback_dev_unassign(gc, pcidev); @@ -741,9 +763,9 @@ static int libxl__device_pci_assignable_remove(libxl__gc *gc, "Couldn't bind device to %s", driver_path); return -1; } - } - pci_assignable_driver_path_remove(gc, pcidev); + pci_assignable_driver_path_remove(gc, pcidev); + } } else { if ( rebind ) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzx-0003MS-Eq; Tue, 22 Sep 2015 10:40:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzv-0003MH-EZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:31 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id F6/3A-22089-E1031065; Tue, 22 Sep 2015 10:40:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1442918426!32752478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5884 invoked from network); 22 Sep 2015 10:40:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzq-0007je-8Q for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzq-0003G1-6j for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:26 +0000 Date: Tue, 22 Sep 2015 10:40:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: tighten parsing of "irq" and "iomem" list elements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adef7d9cc8ddc8cf49a0f460976c7de51a4f53f3 Author: Jan Beulich AuthorDate: Mon Sep 14 07:53:27 2015 -0600 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:26 2015 +0100 xl: tighten parsing of "irq" and "iomem" list elements While "ioport" list element parsing already validates that the entire input string got consumed, its two siblings so far didn't. Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index bfbd421..2706759 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1730,7 +1730,7 @@ static void parse_config_data(const char *config_source, exit(1); } ul = strtoul(buf, &ep, 10); - if (ep == buf) { + if (ep == buf || *ep != '\0') { fprintf(stderr, "xl: Invalid argument parsing irq: %s\n", buf); exit(1); @@ -1752,6 +1752,8 @@ static void parse_config_data(const char *config_source, exit(-1); } for (i = 0; i < num_iomem; i++) { + int used; + buf = xlu_cfg_get_listitem (iomem, i); if (!buf) { fprintf(stderr, @@ -1759,11 +1761,11 @@ static void parse_config_data(const char *config_source, exit(1); } libxl_iomem_range_init(&b_info->iomem[i]); - ret = sscanf(buf, "%" SCNx64",%" SCNx64"@%" SCNx64, + ret = sscanf(buf, "%" SCNx64",%" SCNx64"%n@%" SCNx64"%n", &b_info->iomem[i].start, - &b_info->iomem[i].number, - &b_info->iomem[i].gfn); - if (ret < 2) { + &b_info->iomem[i].number, &used, + &b_info->iomem[i].gfn, &used); + if (ret < 2 || buf[used] != '\0') { fprintf(stderr, "xl: Invalid argument parsing iomem: %s\n", buf); exit(1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzx-0003MS-Eq; Tue, 22 Sep 2015 10:40:33 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzv-0003MH-EZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:31 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id F6/3A-22089-E1031065; Tue, 22 Sep 2015 10:40:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1442918426!32752478!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5884 invoked from network); 22 Sep 2015 10:40:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeKzq-0007je-8Q for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeKzq-0003G1-6j for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:26 +0000 Date: Tue, 22 Sep 2015 10:40:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: tighten parsing of "irq" and "iomem" list elements X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adef7d9cc8ddc8cf49a0f460976c7de51a4f53f3 Author: Jan Beulich AuthorDate: Mon Sep 14 07:53:27 2015 -0600 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:26 2015 +0100 xl: tighten parsing of "irq" and "iomem" list elements While "ioport" list element parsing already validates that the entire input string got consumed, its two siblings so far didn't. Signed-off-by: Jan Beulich Reviewed-by: Dario Faggioli Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index bfbd421..2706759 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1730,7 +1730,7 @@ static void parse_config_data(const char *config_source, exit(1); } ul = strtoul(buf, &ep, 10); - if (ep == buf) { + if (ep == buf || *ep != '\0') { fprintf(stderr, "xl: Invalid argument parsing irq: %s\n", buf); exit(1); @@ -1752,6 +1752,8 @@ static void parse_config_data(const char *config_source, exit(-1); } for (i = 0; i < num_iomem; i++) { + int used; + buf = xlu_cfg_get_listitem (iomem, i); if (!buf) { fprintf(stderr, @@ -1759,11 +1761,11 @@ static void parse_config_data(const char *config_source, exit(1); } libxl_iomem_range_init(&b_info->iomem[i]); - ret = sscanf(buf, "%" SCNx64",%" SCNx64"@%" SCNx64, + ret = sscanf(buf, "%" SCNx64",%" SCNx64"%n@%" SCNx64"%n", &b_info->iomem[i].start, - &b_info->iomem[i].number, - &b_info->iomem[i].gfn); - if (ret < 2) { + &b_info->iomem[i].number, &used, + &b_info->iomem[i].gfn, &used); + if (ret < 2 || buf[used] != '\0') { fprintf(stderr, "xl: Invalid argument parsing iomem: %s\n", buf); exit(1); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeL04-0003Up-HM; Tue, 22 Sep 2015 10:40:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL02-0003T5-KF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:38 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id FD/8A-22089-52031065; Tue, 22 Sep 2015 10:40:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1442918436!33988604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30735 invoked from network); 22 Sep 2015 10:40:37 -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; 22 Sep 2015 10:40:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL00-0007jj-ES for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL00-0003Gt-CX for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:36 +0000 Date: Tue, 22 Sep 2015 10:40:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: hvm_domain drop unused field instropection_enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f315c5323bb8185319384ae94bf913d4d15902c Author: Julien Grall AuthorDate: Mon Sep 14 16:30:38 2015 +0100 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:26 2015 +0100 xen/arm: hvm_domain drop unused field instropection_enabled Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/domain.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 56aa208..7ddaeaa 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -17,7 +17,6 @@ struct hvm_domain { uint64_t params[HVM_NR_PARAMS]; struct hvm_iommu iommu; - bool_t introspection_enabled; } __cacheline_aligned; #ifdef CONFIG_ARM_64 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeL04-0003Up-HM; Tue, 22 Sep 2015 10:40:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL02-0003T5-KF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:38 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id FD/8A-22089-52031065; Tue, 22 Sep 2015 10:40:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1442918436!33988604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30735 invoked from network); 22 Sep 2015 10:40:37 -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; 22 Sep 2015 10:40:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL00-0007jj-ES for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL00-0003Gt-CX for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:36 +0000 Date: Tue, 22 Sep 2015 10:40:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: hvm_domain drop unused field instropection_enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f315c5323bb8185319384ae94bf913d4d15902c Author: Julien Grall AuthorDate: Mon Sep 14 16:30:38 2015 +0100 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:26 2015 +0100 xen/arm: hvm_domain drop unused field instropection_enabled Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/domain.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 56aa208..7ddaeaa 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -17,7 +17,6 @@ struct hvm_domain { uint64_t params[HVM_NR_PARAMS]; struct hvm_iommu iommu; - bool_t introspection_enabled; } __cacheline_aligned; #ifdef CONFIG_ARM_64 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeL0E-0003a2-Jz; Tue, 22 Sep 2015 10:40:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0D-0003ZX-It for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:49 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id CB/B1-29649-03031065; Tue, 22 Sep 2015 10:40:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442918446!15308560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30411 invoked from network); 22 Sep 2015 10:40:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0A-0007ju-Kv for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0A-0003HF-J2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:46 +0000 Date: Tue, 22 Sep 2015 10:40:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: reduce power use by contented spin locks with WFE/SEV X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e625faf45ee1349be7da2b27e38567e01ce4b453 Author: David Vrabel AuthorDate: Mon Aug 3 12:29:19 2015 +0100 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:47 2015 +0100 arm: reduce power use by contented spin locks with WFE/SEV Instead of cpu_relax() while spinning and observing the ticket head, introduce arch_lock_relax() which executes a WFE instruction. After the ticket head is changed call arch_lock_signal() to execute an SEV instruction (with the required DSB first) to wake any spinners. This should improve power consumption when locks are contented and spinning. For consistency also move arch_lock_(acquire|release)_barrier to asm/spinlock.h. Booted the result on arm32 (Midway) and arm64 (Mustang). Build test only on amd64. Signed-off-by: David Vrabel [ijc: add barrier, rename as arch_lock_*, move arch_lock_*_barrier, test] Signed-off-by: Ian Campbell Cc: Stefano Stabellini Cc: Jan Beulich Cc: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/common/spinlock.c | 5 +++-- xen/include/asm-arm/spinlock.h | 9 ++++++++- xen/include/asm-arm/system.h | 3 --- xen/include/asm-x86/spinlock.h | 14 ++++++++++++++ xen/include/asm-x86/system.h | 11 ----------- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 29149d1..7f89694 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -141,7 +141,7 @@ void _spin_lock(spinlock_t *lock) while ( tickets.tail != observe_head(&lock->tickets) ) { LOCK_PROFILE_BLOCK; - cpu_relax(); + arch_lock_relax(); } LOCK_PROFILE_GOT; preempt_disable(); @@ -170,6 +170,7 @@ void _spin_unlock(spinlock_t *lock) preempt_enable(); LOCK_PROFILE_REL; add_sized(&lock->tickets.head, 1); + arch_lock_signal(); } void _spin_unlock_irq(spinlock_t *lock) @@ -228,7 +229,7 @@ void _spin_barrier(spinlock_t *lock) if ( sample.head != sample.tail ) { while ( observe_head(&lock->tickets) == sample.head ) - cpu_relax(); + arch_lock_relax(); #ifdef LOCK_PROFILE if ( lock->profile ) { diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h index 81955d1..8cdf9e1 100644 --- a/xen/include/asm-arm/spinlock.h +++ b/xen/include/asm-arm/spinlock.h @@ -1,6 +1,13 @@ #ifndef __ASM_SPINLOCK_H #define __ASM_SPINLOCK_H -/* Nothing ARM specific. */ +#define arch_lock_acquire_barrier() smp_mb() +#define arch_lock_release_barrier() smp_mb() + +#define arch_lock_relax() wfe() +#define arch_lock_signal() do { \ + dsb(ishst); \ + sev(); \ +} while(0) #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index f0e222f..2eb96e8 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,9 +53,6 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) -#define arch_lock_acquire_barrier() smp_mb() -#define arch_lock_release_barrier() smp_mb() - extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 7d69e75..70a85af 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -4,4 +4,18 @@ #define _raw_read_unlock(l) \ asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) +/* + * On x86 the only reordering is of reads with older writes. In the + * lock case, the read in observe_head() can only be reordered with + * writes that precede it, and moving a write _into_ a locked section + * is OK. In the release case, the write in add_sized() can only be + * reordered with reads that follow it, and hoisting a read _into_ a + * locked region is OK. + */ +#define arch_lock_acquire_barrier() barrier() +#define arch_lock_release_barrier() barrier() + +#define arch_lock_relax() cpu_relax() +#define arch_lock_signal() + #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 25a6a2a..9fb70f5 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,17 +185,6 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) -/* - * On x86 the only reordering is of reads with older writes. In the - * lock case, the read in observe_head() can only be reordered with - * writes that precede it, and moving a write _into_ a locked section - * is OK. In the release case, the write in add_sized() can only be - * reordered with reads that follow it, and hoisting a read _into_ a - * locked region is OK. - */ -#define arch_lock_acquire_barrier() barrier() -#define arch_lock_release_barrier() barrier() - #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:40:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:40: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 1ZeL0E-0003a2-Jz; Tue, 22 Sep 2015 10:40:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0D-0003ZX-It for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:49 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id CB/B1-29649-03031065; Tue, 22 Sep 2015 10:40:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442918446!15308560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30411 invoked from network); 22 Sep 2015 10:40:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0A-0007ju-Kv for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0A-0003HF-J2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:46 +0000 Date: Tue, 22 Sep 2015 10:40:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: reduce power use by contented spin locks with WFE/SEV X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e625faf45ee1349be7da2b27e38567e01ce4b453 Author: David Vrabel AuthorDate: Mon Aug 3 12:29:19 2015 +0100 Commit: Ian Campbell CommitDate: Tue Sep 15 11:58:47 2015 +0100 arm: reduce power use by contented spin locks with WFE/SEV Instead of cpu_relax() while spinning and observing the ticket head, introduce arch_lock_relax() which executes a WFE instruction. After the ticket head is changed call arch_lock_signal() to execute an SEV instruction (with the required DSB first) to wake any spinners. This should improve power consumption when locks are contented and spinning. For consistency also move arch_lock_(acquire|release)_barrier to asm/spinlock.h. Booted the result on arm32 (Midway) and arm64 (Mustang). Build test only on amd64. Signed-off-by: David Vrabel [ijc: add barrier, rename as arch_lock_*, move arch_lock_*_barrier, test] Signed-off-by: Ian Campbell Cc: Stefano Stabellini Cc: Jan Beulich Cc: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/common/spinlock.c | 5 +++-- xen/include/asm-arm/spinlock.h | 9 ++++++++- xen/include/asm-arm/system.h | 3 --- xen/include/asm-x86/spinlock.h | 14 ++++++++++++++ xen/include/asm-x86/system.h | 11 ----------- 5 files changed, 25 insertions(+), 17 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 29149d1..7f89694 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -141,7 +141,7 @@ void _spin_lock(spinlock_t *lock) while ( tickets.tail != observe_head(&lock->tickets) ) { LOCK_PROFILE_BLOCK; - cpu_relax(); + arch_lock_relax(); } LOCK_PROFILE_GOT; preempt_disable(); @@ -170,6 +170,7 @@ void _spin_unlock(spinlock_t *lock) preempt_enable(); LOCK_PROFILE_REL; add_sized(&lock->tickets.head, 1); + arch_lock_signal(); } void _spin_unlock_irq(spinlock_t *lock) @@ -228,7 +229,7 @@ void _spin_barrier(spinlock_t *lock) if ( sample.head != sample.tail ) { while ( observe_head(&lock->tickets) == sample.head ) - cpu_relax(); + arch_lock_relax(); #ifdef LOCK_PROFILE if ( lock->profile ) { diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h index 81955d1..8cdf9e1 100644 --- a/xen/include/asm-arm/spinlock.h +++ b/xen/include/asm-arm/spinlock.h @@ -1,6 +1,13 @@ #ifndef __ASM_SPINLOCK_H #define __ASM_SPINLOCK_H -/* Nothing ARM specific. */ +#define arch_lock_acquire_barrier() smp_mb() +#define arch_lock_release_barrier() smp_mb() + +#define arch_lock_relax() wfe() +#define arch_lock_signal() do { \ + dsb(ishst); \ + sev(); \ +} while(0) #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/asm-arm/system.h b/xen/include/asm-arm/system.h index f0e222f..2eb96e8 100644 --- a/xen/include/asm-arm/system.h +++ b/xen/include/asm-arm/system.h @@ -53,9 +53,6 @@ #define arch_fetch_and_add(x, v) __sync_fetch_and_add(x, v) -#define arch_lock_acquire_barrier() smp_mb() -#define arch_lock_release_barrier() smp_mb() - extern struct vcpu *__context_switch(struct vcpu *prev, struct vcpu *next); #endif diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 7d69e75..70a85af 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -4,4 +4,18 @@ #define _raw_read_unlock(l) \ asm volatile ( "lock; dec%z0 %0" : "+m" ((l)->lock) :: "memory" ) +/* + * On x86 the only reordering is of reads with older writes. In the + * lock case, the read in observe_head() can only be reordered with + * writes that precede it, and moving a write _into_ a locked section + * is OK. In the release case, the write in add_sized() can only be + * reordered with reads that follow it, and hoisting a read _into_ a + * locked region is OK. + */ +#define arch_lock_acquire_barrier() barrier() +#define arch_lock_release_barrier() barrier() + +#define arch_lock_relax() cpu_relax() +#define arch_lock_signal() + #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/asm-x86/system.h b/xen/include/asm-x86/system.h index 25a6a2a..9fb70f5 100644 --- a/xen/include/asm-x86/system.h +++ b/xen/include/asm-x86/system.h @@ -185,17 +185,6 @@ static always_inline unsigned long __xadd( #define set_mb(var, value) do { xchg(&var, value); } while (0) #define set_wmb(var, value) do { var = value; wmb(); } while (0) -/* - * On x86 the only reordering is of reads with older writes. In the - * lock case, the read in observe_head() can only be reordered with - * writes that precede it, and moving a write _into_ a locked section - * is OK. In the release case, the write in add_sized() can only be - * reordered with reads that follow it, and hoisting a read _into_ a - * locked region is OK. - */ -#define arch_lock_acquire_barrier() barrier() -#define arch_lock_release_barrier() barrier() - #define local_irq_disable() asm volatile ( "cli" : : : "memory" ) #define local_irq_enable() asm volatile ( "sti" : : : "memory" ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0O-0003c6-MV; Tue, 22 Sep 2015 10:41:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0N-0003bt-Hk for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:59 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id E9/F4-06021-A3031065; Tue, 22 Sep 2015 10:40:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442918456!11869241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23621 invoked from network); 22 Sep 2015 10:40:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0K-0007k2-Pr for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0K-0003Hb-Oh for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:56 +0000 Date: Tue, 22 Sep 2015 10:40:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/boot: remove unneeded instruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e94af1c1bef62daa706c644b39a8517cb794fa74 Author: Daniel Kiper AuthorDate: Wed Sep 16 11:18:38 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:18:38 2015 +0200 x86/boot: remove unneeded instruction Signed-off-by: Daniel Kiper Reviewed-by: Konrad Rzeszutek Wilk --- xen/arch/x86/boot/head.S | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index cfd59dc..f63b349 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -169,7 +169,6 @@ __start: /* Apply relocations to bootstrap trampoline. */ mov sym_phys(trampoline_phys),%edx mov $sym_phys(__trampoline_rel_start),%edi - mov %edx,sym_phys(trampoline_phys) 1: mov (%edi),%eax add %edx,(%edi,%eax) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0O-0003c6-MV; Tue, 22 Sep 2015 10:41:00 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0N-0003bt-Hk for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:59 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id E9/F4-06021-A3031065; Tue, 22 Sep 2015 10:40:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1442918456!11869241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23621 invoked from network); 22 Sep 2015 10:40:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:40:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0K-0007k2-Pr for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0K-0003Hb-Oh for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:40:56 +0000 Date: Tue, 22 Sep 2015 10:40:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/boot: remove unneeded instruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e94af1c1bef62daa706c644b39a8517cb794fa74 Author: Daniel Kiper AuthorDate: Wed Sep 16 11:18:38 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:18:38 2015 +0200 x86/boot: remove unneeded instruction Signed-off-by: Daniel Kiper Reviewed-by: Konrad Rzeszutek Wilk --- xen/arch/x86/boot/head.S | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index cfd59dc..f63b349 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -169,7 +169,6 @@ __start: /* Apply relocations to bootstrap trampoline. */ mov sym_phys(trampoline_phys),%edx mov $sym_phys(__trampoline_rel_start),%edi - mov %edx,sym_phys(trampoline_phys) 1: mov (%edi),%eax add %edx,(%edi,%eax) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0Z-0003dg-P1; Tue, 22 Sep 2015 10:41:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0Y-0003dR-Tf for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:11 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 2B/75-01143-54031065; Tue, 22 Sep 2015 10:41:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1442918467!19590065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5361 invoked from network); 22 Sep 2015 10:41:08 -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; 22 Sep 2015 10:41:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0U-0007kd-VF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0U-0003ID-Tr for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:06 +0000 Date: Tue, 22 Sep 2015 10:41:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: fail if no hardware support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7d5d5d8ea1ecbd6ef8b47dace4dec825f0f6e48 Author: Jan Beulich AuthorDate: Wed Sep 16 11:20:27 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:20:27 2015 +0200 x86/MSI: fail if no hardware support This is to guard against buggy callers (luckily Dom0 only) invoking the respective hypercall for a device not being MSI-capable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 588305a..3dbb84d 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -696,6 +696,8 @@ static int msi_capability_init(struct pci_dev *dev, ASSERT(spin_is_locked(&pcidevs_lock)); pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + if ( !pos ) + return -ENODEV; control = pci_conf_read16(seg, bus, slot, func, msi_control_reg(pos)); maxvec = multi_msi_capable(control); if ( nvec > maxvec ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0Z-0003dg-P1; Tue, 22 Sep 2015 10:41:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0Y-0003dR-Tf for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:11 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 2B/75-01143-54031065; Tue, 22 Sep 2015 10:41:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1442918467!19590065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5361 invoked from network); 22 Sep 2015 10:41:08 -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; 22 Sep 2015 10:41:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0U-0007kd-VF for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0U-0003ID-Tr for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:06 +0000 Date: Tue, 22 Sep 2015 10:41:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/MSI: fail if no hardware support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7d5d5d8ea1ecbd6ef8b47dace4dec825f0f6e48 Author: Jan Beulich AuthorDate: Wed Sep 16 11:20:27 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:20:27 2015 +0200 x86/MSI: fail if no hardware support This is to guard against buggy callers (luckily Dom0 only) invoking the respective hypercall for a device not being MSI-capable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/msi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 588305a..3dbb84d 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -696,6 +696,8 @@ static int msi_capability_init(struct pci_dev *dev, ASSERT(spin_is_locked(&pcidevs_lock)); pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + if ( !pos ) + return -ENODEV; control = pci_conf_read16(seg, bus, slot, func, msi_control_reg(pos)); maxvec = multi_msi_capable(control); if ( nvec > maxvec ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0i-0003fM-RT; Tue, 22 Sep 2015 10:41:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0h-0003fC-TU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:20 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id F6/DC-03819-F4031065; Tue, 22 Sep 2015 10:41:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442918477!31583297!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7067 invoked from network); 22 Sep 2015 10:41:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0f-0007kl-64 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0f-0003Ie-2x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:17 +0000 Date: Tue, 22 Sep 2015 10:41:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd: correct loglevel when check group devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92906abbee6d1dc975111a88d83cd3550f71e4c8 Author: Tiejun Chen AuthorDate: Wed Sep 16 11:20:54 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:20:54 2015 +0200 vtd: correct loglevel when check group devices Since commit 3848058e7dd6 (vtd/iommu: permit group devices to passthrough in relaxed mode) is introduced, we always print message as XENLOG_G_WARNING but its not correct in the case of strict mode. So here is making this message depending on the specific mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 7b45bff..b67b624 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2314,9 +2314,10 @@ static int intel_iommu_assign_device( { bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); - printk(XENLOG_G_WARNING VTDPREFIX + printk(XENLOG_GUEST "%s" VTDPREFIX " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? XENLOG_WARNING : XENLOG_ERR, relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0i-0003fM-RT; Tue, 22 Sep 2015 10:41:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0h-0003fC-TU for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:20 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id F6/DC-03819-F4031065; Tue, 22 Sep 2015 10:41:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1442918477!31583297!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7067 invoked from network); 22 Sep 2015 10:41:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0f-0007kl-64 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0f-0003Ie-2x for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:17 +0000 Date: Tue, 22 Sep 2015 10:41:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vtd: correct loglevel when check group devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92906abbee6d1dc975111a88d83cd3550f71e4c8 Author: Tiejun Chen AuthorDate: Wed Sep 16 11:20:54 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:20:54 2015 +0200 vtd: correct loglevel when check group devices Since commit 3848058e7dd6 (vtd/iommu: permit group devices to passthrough in relaxed mode) is introduced, we always print message as XENLOG_G_WARNING but its not correct in the case of strict mode. So here is making this message depending on the specific mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/iommu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 7b45bff..b67b624 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2314,9 +2314,10 @@ static int intel_iommu_assign_device( { bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); - printk(XENLOG_G_WARNING VTDPREFIX + printk(XENLOG_GUEST "%s" VTDPREFIX " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? XENLOG_WARNING : XENLOG_ERR, relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0x-0003hS-W8; Tue, 22 Sep 2015 10:41:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0w-0003h5-Mc for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:34 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id CC/7A-25435-A5031065; Tue, 22 Sep 2015 10:41:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1442918487!33160019!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18184 invoked from network); 22 Sep 2015 10:41:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0p-0007kt-CK for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0p-0003JH-AK for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:27 +0000 Date: Tue, 22 Sep 2015 10:41:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c373b912e74659f0e0898ae93e89513694cfd94e Author: Andrew Cooper AuthorDate: Wed Sep 16 11:22:00 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:22:00 2015 +0200 x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) There is no current problem, as both NCAPINTS and pi->hw_cap are 8 entries, but the limit should be calculated appropriately so as to avoid hypervisor stack corruption if the two do get out of sync. Signed-off-by: Andrew Cooper --- xen/arch/x86/sysctl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index f36b52f..38b5dcb 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -75,7 +75,8 @@ long cpu_down_helper(void *data) void arch_do_physinfo(xen_sysctl_physinfo_t *pi) { - memcpy(pi->hw_cap, boot_cpu_data.x86_capability, NCAPINTS*4); + memcpy(pi->hw_cap, boot_cpu_data.x86_capability, + min(sizeof(pi->hw_cap), sizeof(boot_cpu_data.x86_capability))); if ( hvm_enabled ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm; if ( iommu_enabled ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL0x-0003hS-W8; Tue, 22 Sep 2015 10:41:35 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0w-0003h5-Mc for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:34 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id CC/7A-25435-A5031065; Tue, 22 Sep 2015 10:41:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1442918487!33160019!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18184 invoked from network); 22 Sep 2015 10:41:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0p-0007kt-CK for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0p-0003JH-AK for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:27 +0000 Date: Tue, 22 Sep 2015 10:41:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c373b912e74659f0e0898ae93e89513694cfd94e Author: Andrew Cooper AuthorDate: Wed Sep 16 11:22:00 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:22:00 2015 +0200 x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) There is no current problem, as both NCAPINTS and pi->hw_cap are 8 entries, but the limit should be calculated appropriately so as to avoid hypervisor stack corruption if the two do get out of sync. Signed-off-by: Andrew Cooper --- xen/arch/x86/sysctl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index f36b52f..38b5dcb 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -75,7 +75,8 @@ long cpu_down_helper(void *data) void arch_do_physinfo(xen_sysctl_physinfo_t *pi) { - memcpy(pi->hw_cap, boot_cpu_data.x86_capability, NCAPINTS*4); + memcpy(pi->hw_cap, boot_cpu_data.x86_capability, + min(sizeof(pi->hw_cap), sizeof(boot_cpu_data.x86_capability))); if ( hvm_enabled ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm; if ( iommu_enabled ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL13-0003iU-2T; Tue, 22 Sep 2015 10:41:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL11-0003iC-Vq for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:40 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E8/5D-22089-36031065; Tue, 22 Sep 2015 10:41:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442918497!36853534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31052 invoked from network); 22 Sep 2015 10:41:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0z-0007kx-HD for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0z-0003Lf-GE for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:37 +0000 Date: Tue, 22 Sep 2015 10:41:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mce: fix code style X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 157c9f4a18ae7e97cf795d473db44b87116e91bc Author: Haozhong Zhang AuthorDate: Wed Sep 16 11:39:16 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:39:16 2015 +0200 x86/mce: fix code style Remove trailing whitespaces and fix indentations in mce.c and xen_mca.h. Signed-off-by: Haozhong Zhang Acked-by: Christoph Egger --- xen/arch/x86/cpu/mcheck/mce.c | 10 +++++----- xen/include/public/arch-x86/xen-mca.h | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 7c2cacc..561257d 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -105,7 +105,7 @@ void x86_mce_callback_register(x86_mce_callback_t cbfunc) mc_callback_bank_extended = cbfunc; } -/* Machine check recoverable judgement callback handler +/* Machine check recoverable judgement callback handler * It is used to judge whether an UC error is recoverable by software */ static mce_recoverable_t mc_recoverable_scan = NULL; @@ -160,9 +160,9 @@ static void mcabank_clear(int banknum) } /* Judging whether to Clear Machine Check error bank callback handler - * According to Intel latest MCA OS Recovery Writer's Guide, + * According to Intel latest MCA OS Recovery Writer's Guide, * whether the error MCA bank needs to be cleared is decided by the mca_source - * and MCi_status bit value. + * and MCi_status bit value. */ static mce_need_clearbank_t mc_need_clearbank_scan = NULL; @@ -535,7 +535,7 @@ void mcheck_cmn_handler(const struct cpu_user_regs *regs) } atomic_set(&found_error, 0); } - mce_barrier_exit(&mce_trap_bar); + mce_barrier_exit(&mce_trap_bar); /* Clear flags after above fatal check */ mce_barrier_enter(&mce_trap_bar); @@ -891,7 +891,7 @@ void x86_mcinfo_dump(struct mc_info *mi) "CPU%d: Machine Check Exception: %16"PRIx64"\n", mc_global->mc_coreid, mc_global->mc_gstatus); } else if (mc_global->mc_flags & MC_FLAG_CMCI) { - printk(XENLOG_WARNING "CMCI occurred on CPU %d.\n", + printk(XENLOG_WARNING "CMCI occurred on CPU %d.\n", mc_global->mc_coreid); } else if (mc_global->mc_flags & MC_FLAG_POLLED) { printk(XENLOG_WARNING "POLLED occurred on CPU %d.\n", diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index 04382ed..ec1237a 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -1,11 +1,11 @@ /****************************************************************************** * arch-x86/mca.h - * + * * Contributed by Advanced Micro Devices, Inc. * Author: Christoph Egger * * Guest OS machine check interface to x86 Xen. - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the @@ -156,7 +156,7 @@ struct mcinfo_msr { }; /* contains mc information from other - * or additional mc MSRs */ + * or additional mc MSRs */ struct mcinfo_extended { struct mcinfo_common common; @@ -193,10 +193,10 @@ struct mcinfo_extended { /* L3 cache disable Action */ #define MC_ACTION_CACHE_SHRINK (0x1 << 2) -/* Below interface used between XEN/DOM0 for passing XEN's recovery action - * information to DOM0. +/* Below interface used between XEN/DOM0 for passing XEN's recovery action + * information to DOM0. * usage Senario: After offlining broken page, XEN might pass its page offline - * recovery action result to DOM0. DOM0 will save the information in + * recovery action result to DOM0. DOM0 will save the information in * non-volatile memory for further proactive actions, such as offlining the * easy broken page earlier when doing next reboot. */ @@ -255,8 +255,8 @@ DEFINE_XEN_GUEST_HANDLE(mc_info_t); #define MC_CAPS_AMD_ECX 6 /* cpuid level 0x80000001 (%ecx) */ struct mcinfo_logical_cpu { - uint32_t mc_cpunr; - uint32_t mc_chipid; + uint32_t mc_cpunr; + uint32_t mc_chipid; uint16_t mc_coreid; uint16_t mc_threadid; uint32_t mc_apicid; @@ -281,7 +281,7 @@ typedef struct mcinfo_logical_cpu xen_mc_logical_cpu_t; DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); -/* +/* * OS's should use these instead of writing their own lookup function * each with its own bugs and drawbacks. * We use macros instead of static inline functions to allow guests @@ -388,12 +388,12 @@ struct xen_mc_physcpuinfo { #define XEN_MC_msrinject 4 #define MC_MSRINJ_MAXMSRS 8 struct xen_mc_msrinject { - /* IN */ - uint32_t mcinj_cpunr; /* target processor id */ - uint32_t mcinj_flags; /* see MC_MSRINJ_F_* below */ - uint32_t mcinj_count; /* 0 .. count-1 in array are valid */ - uint32_t _pad0; - struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS]; + /* IN */ + uint32_t mcinj_cpunr; /* target processor id */ + uint32_t mcinj_flags; /* see MC_MSRINJ_F_* below */ + uint32_t mcinj_count; /* 0 .. count-1 in array are valid */ + uint32_t _pad0; + struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS]; }; /* Flags for mcinj_flags above; bits 16-31 are reserved */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41: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 1ZeL13-0003iU-2T; Tue, 22 Sep 2015 10:41:41 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL11-0003iC-Vq for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:40 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E8/5D-22089-36031065; Tue, 22 Sep 2015 10:41:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442918497!36853534!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31052 invoked from network); 22 Sep 2015 10:41:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL0z-0007kx-HD for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL0z-0003Lf-GE for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:37 +0000 Date: Tue, 22 Sep 2015 10:41:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mce: fix code style X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 157c9f4a18ae7e97cf795d473db44b87116e91bc Author: Haozhong Zhang AuthorDate: Wed Sep 16 11:39:16 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:39:16 2015 +0200 x86/mce: fix code style Remove trailing whitespaces and fix indentations in mce.c and xen_mca.h. Signed-off-by: Haozhong Zhang Acked-by: Christoph Egger --- xen/arch/x86/cpu/mcheck/mce.c | 10 +++++----- xen/include/public/arch-x86/xen-mca.h | 30 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 7c2cacc..561257d 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -105,7 +105,7 @@ void x86_mce_callback_register(x86_mce_callback_t cbfunc) mc_callback_bank_extended = cbfunc; } -/* Machine check recoverable judgement callback handler +/* Machine check recoverable judgement callback handler * It is used to judge whether an UC error is recoverable by software */ static mce_recoverable_t mc_recoverable_scan = NULL; @@ -160,9 +160,9 @@ static void mcabank_clear(int banknum) } /* Judging whether to Clear Machine Check error bank callback handler - * According to Intel latest MCA OS Recovery Writer's Guide, + * According to Intel latest MCA OS Recovery Writer's Guide, * whether the error MCA bank needs to be cleared is decided by the mca_source - * and MCi_status bit value. + * and MCi_status bit value. */ static mce_need_clearbank_t mc_need_clearbank_scan = NULL; @@ -535,7 +535,7 @@ void mcheck_cmn_handler(const struct cpu_user_regs *regs) } atomic_set(&found_error, 0); } - mce_barrier_exit(&mce_trap_bar); + mce_barrier_exit(&mce_trap_bar); /* Clear flags after above fatal check */ mce_barrier_enter(&mce_trap_bar); @@ -891,7 +891,7 @@ void x86_mcinfo_dump(struct mc_info *mi) "CPU%d: Machine Check Exception: %16"PRIx64"\n", mc_global->mc_coreid, mc_global->mc_gstatus); } else if (mc_global->mc_flags & MC_FLAG_CMCI) { - printk(XENLOG_WARNING "CMCI occurred on CPU %d.\n", + printk(XENLOG_WARNING "CMCI occurred on CPU %d.\n", mc_global->mc_coreid); } else if (mc_global->mc_flags & MC_FLAG_POLLED) { printk(XENLOG_WARNING "POLLED occurred on CPU %d.\n", diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index 04382ed..ec1237a 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -1,11 +1,11 @@ /****************************************************************************** * arch-x86/mca.h - * + * * Contributed by Advanced Micro Devices, Inc. * Author: Christoph Egger * * Guest OS machine check interface to x86 Xen. - * + * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to * deal in the Software without restriction, including without limitation the @@ -156,7 +156,7 @@ struct mcinfo_msr { }; /* contains mc information from other - * or additional mc MSRs */ + * or additional mc MSRs */ struct mcinfo_extended { struct mcinfo_common common; @@ -193,10 +193,10 @@ struct mcinfo_extended { /* L3 cache disable Action */ #define MC_ACTION_CACHE_SHRINK (0x1 << 2) -/* Below interface used between XEN/DOM0 for passing XEN's recovery action - * information to DOM0. +/* Below interface used between XEN/DOM0 for passing XEN's recovery action + * information to DOM0. * usage Senario: After offlining broken page, XEN might pass its page offline - * recovery action result to DOM0. DOM0 will save the information in + * recovery action result to DOM0. DOM0 will save the information in * non-volatile memory for further proactive actions, such as offlining the * easy broken page earlier when doing next reboot. */ @@ -255,8 +255,8 @@ DEFINE_XEN_GUEST_HANDLE(mc_info_t); #define MC_CAPS_AMD_ECX 6 /* cpuid level 0x80000001 (%ecx) */ struct mcinfo_logical_cpu { - uint32_t mc_cpunr; - uint32_t mc_chipid; + uint32_t mc_cpunr; + uint32_t mc_chipid; uint16_t mc_coreid; uint16_t mc_threadid; uint32_t mc_apicid; @@ -281,7 +281,7 @@ typedef struct mcinfo_logical_cpu xen_mc_logical_cpu_t; DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); -/* +/* * OS's should use these instead of writing their own lookup function * each with its own bugs and drawbacks. * We use macros instead of static inline functions to allow guests @@ -388,12 +388,12 @@ struct xen_mc_physcpuinfo { #define XEN_MC_msrinject 4 #define MC_MSRINJ_MAXMSRS 8 struct xen_mc_msrinject { - /* IN */ - uint32_t mcinj_cpunr; /* target processor id */ - uint32_t mcinj_flags; /* see MC_MSRINJ_F_* below */ - uint32_t mcinj_count; /* 0 .. count-1 in array are valid */ - uint32_t _pad0; - struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS]; + /* IN */ + uint32_t mcinj_cpunr; /* target processor id */ + uint32_t mcinj_flags; /* see MC_MSRINJ_F_* below */ + uint32_t mcinj_count; /* 0 .. count-1 in array are valid */ + uint32_t _pad0; + struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS]; }; /* Flags for mcinj_flags above; bits 16-31 are reserved */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1E-0003kP-59; Tue, 22 Sep 2015 10:41:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1C-0003k7-KS for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:50 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id A7/2B-25435-E6031065; Tue, 22 Sep 2015 10:41:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1442918507!51967322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29920 invoked from network); 22 Sep 2015 10:41:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL19-0007l9-LM for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL19-0003MA-KO for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:47 +0000 Date: Tue, 22 Sep 2015 10:41:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-mceinj: fix code style X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 191f025598f75dfa51ce01f7c69ee8a58692760a Author: Haozhong Zhang AuthorDate: Wed Sep 16 11:40:16 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:40:16 2015 +0200 tools/xen-mceinj: fix code style Remove trailing whitespaces in xen-mceinj.c. Signed-off-by: Haozhong Zhang Acked-by: Wei Liu Acked-by: Christoph Egger --- tools/tests/mce-test/tools/xen-mceinj.c | 66 +++++++++++++++--------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index e2e49cb..71813c6 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License along with * this program; If not, see . - * + * * Authors: Yunhong Jiang * Haicheng Li * Xudong Hao @@ -217,18 +217,18 @@ static uint64_t bank_addr(int bank, int type) switch ( type ) { - case MCi_type_CTL: - case MCi_type_STATUS: - case MCi_type_ADDR: - case MCi_type_MISC: - addr = MSR_IA32_MC0_CTL + (bank * 4) + type; - break; - case MCi_type_CTL2: - addr = MSR_IA32_MC0_CTL2 + bank; - break; - default: - addr = INVALID_MSR; - break; + case MCi_type_CTL: + case MCi_type_STATUS: + case MCi_type_ADDR: + case MCi_type_MISC: + addr = MSR_IA32_MC0_CTL + (bank * 4) + type; + break; + case MCi_type_CTL2: + addr = MSR_IA32_MC0_CTL2 + bank; + break; + default: + addr = INVALID_MSR; + break; } return addr; @@ -243,7 +243,7 @@ static int add_msr_intpose(xc_interface *xc_handle, uint32_t count; if ( (msr_inj.mcinj_count && - (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) || + (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) || msr_inj.mcinj_count == MC_MSRINJ_MAXMSRS ) { flush_msr_inj(xc_handle); @@ -282,8 +282,8 @@ static int add_msr_bank_intpose(xc_interface *xc_handle, #define mfn_valid(_mfn) (_mfn != MCE_INVALID_MFN) #define mfn_to_pfn(_mfn) (live_m2p[(_mfn)]) static uint64_t guest_mfn(xc_interface *xc_handle, - uint32_t domain, - uint64_t gpfn) + uint32_t domain, + uint64_t gpfn) { xen_pfn_t *live_m2p = NULL; int ret; @@ -300,8 +300,8 @@ static uint64_t guest_mfn(xc_interface *xc_handle, return MCE_INVALID_MFN; /* Get max gpfn */ - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; + max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, + sizeof(domain)) + 1; if ( max_gpfn <= 0 ) err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); @@ -360,8 +360,8 @@ static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle, if ( domain == DOMID_XEN ) return gfn; - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; + max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, + sizeof(domain)) + 1; if ( max_gpfn <= 0 ) err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); index = gfn % max_gpfn; @@ -374,7 +374,7 @@ static int inject_mcg_status(xc_interface *xc_handle, uint64_t val) { return add_msr_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MSR_IA32_MCG_STATUS, val); + MSR_IA32_MCG_STATUS, val); } static int inject_mci_status(xc_interface *xc_handle, @@ -383,25 +383,25 @@ static int inject_mci_status(xc_interface *xc_handle, uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_STATUS, bank, val); + MCi_type_STATUS, bank, val); } static int inject_mci_misc(xc_interface *xc_handle, - uint32_t cpu_nr, - uint64_t bank, - uint64_t val) + uint32_t cpu_nr, + uint64_t bank, + uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_MISC, bank, val); + MCi_type_MISC, bank, val); } static int inject_mci_addr(xc_interface *xc_handle, - uint32_t cpu_nr, - uint64_t bank, - uint64_t val) + uint32_t cpu_nr, + uint64_t bank, + uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_ADDR, bank, val); + MCi_type_ADDR, bank, val); } static int inject(xc_interface *xc_handle, struct mce_info *mce, @@ -553,7 +553,7 @@ int main(int argc, char *argv[]) return 0; } } - + if ( domid != DOMID_XEN ) { max_gpa = xs_get_dom_mem(domid); Lprintf("get domain %d max gpa is: 0x%lx", domid, max_gpa); @@ -570,7 +570,7 @@ int main(int argc, char *argv[]) haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); if ( domid == DOMID_XEN ) Lprintf("Xen: mfn=0x%lx, haddr=0x%lx", mfn, haddr); - else + else Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx, mfn=0x%lx, haddr=0x%lx", domid, gaddr, gpfn, mfn, haddr); goto out; @@ -583,7 +583,7 @@ int main(int argc, char *argv[]) inject(xc_handle, &mce_table[type], cpu_nr, domid, gaddr); -out: + out: xc_interface_close(xc_handle); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:41:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:41:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1E-0003kP-59; Tue, 22 Sep 2015 10:41:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1C-0003k7-KS for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:50 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id A7/2B-25435-E6031065; Tue, 22 Sep 2015 10:41:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1442918507!51967322!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29920 invoked from network); 22 Sep 2015 10:41:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL19-0007l9-LM for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL19-0003MA-KO for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:47 +0000 Date: Tue, 22 Sep 2015 10:41:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-mceinj: fix code style X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 191f025598f75dfa51ce01f7c69ee8a58692760a Author: Haozhong Zhang AuthorDate: Wed Sep 16 11:40:16 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:40:16 2015 +0200 tools/xen-mceinj: fix code style Remove trailing whitespaces in xen-mceinj.c. Signed-off-by: Haozhong Zhang Acked-by: Wei Liu Acked-by: Christoph Egger --- tools/tests/mce-test/tools/xen-mceinj.c | 66 +++++++++++++++--------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index e2e49cb..71813c6 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -13,7 +13,7 @@ * * You should have received a copy of the GNU General Public License along with * this program; If not, see . - * + * * Authors: Yunhong Jiang * Haicheng Li * Xudong Hao @@ -217,18 +217,18 @@ static uint64_t bank_addr(int bank, int type) switch ( type ) { - case MCi_type_CTL: - case MCi_type_STATUS: - case MCi_type_ADDR: - case MCi_type_MISC: - addr = MSR_IA32_MC0_CTL + (bank * 4) + type; - break; - case MCi_type_CTL2: - addr = MSR_IA32_MC0_CTL2 + bank; - break; - default: - addr = INVALID_MSR; - break; + case MCi_type_CTL: + case MCi_type_STATUS: + case MCi_type_ADDR: + case MCi_type_MISC: + addr = MSR_IA32_MC0_CTL + (bank * 4) + type; + break; + case MCi_type_CTL2: + addr = MSR_IA32_MC0_CTL2 + bank; + break; + default: + addr = INVALID_MSR; + break; } return addr; @@ -243,7 +243,7 @@ static int add_msr_intpose(xc_interface *xc_handle, uint32_t count; if ( (msr_inj.mcinj_count && - (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) || + (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) || msr_inj.mcinj_count == MC_MSRINJ_MAXMSRS ) { flush_msr_inj(xc_handle); @@ -282,8 +282,8 @@ static int add_msr_bank_intpose(xc_interface *xc_handle, #define mfn_valid(_mfn) (_mfn != MCE_INVALID_MFN) #define mfn_to_pfn(_mfn) (live_m2p[(_mfn)]) static uint64_t guest_mfn(xc_interface *xc_handle, - uint32_t domain, - uint64_t gpfn) + uint32_t domain, + uint64_t gpfn) { xen_pfn_t *live_m2p = NULL; int ret; @@ -300,8 +300,8 @@ static uint64_t guest_mfn(xc_interface *xc_handle, return MCE_INVALID_MFN; /* Get max gpfn */ - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; + max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, + sizeof(domain)) + 1; if ( max_gpfn <= 0 ) err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); @@ -360,8 +360,8 @@ static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle, if ( domain == DOMID_XEN ) return gfn; - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; + max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, + sizeof(domain)) + 1; if ( max_gpfn <= 0 ) err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); index = gfn % max_gpfn; @@ -374,7 +374,7 @@ static int inject_mcg_status(xc_interface *xc_handle, uint64_t val) { return add_msr_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MSR_IA32_MCG_STATUS, val); + MSR_IA32_MCG_STATUS, val); } static int inject_mci_status(xc_interface *xc_handle, @@ -383,25 +383,25 @@ static int inject_mci_status(xc_interface *xc_handle, uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_STATUS, bank, val); + MCi_type_STATUS, bank, val); } static int inject_mci_misc(xc_interface *xc_handle, - uint32_t cpu_nr, - uint64_t bank, - uint64_t val) + uint32_t cpu_nr, + uint64_t bank, + uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_MISC, bank, val); + MCi_type_MISC, bank, val); } static int inject_mci_addr(xc_interface *xc_handle, - uint32_t cpu_nr, - uint64_t bank, - uint64_t val) + uint32_t cpu_nr, + uint64_t bank, + uint64_t val) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_ADDR, bank, val); + MCi_type_ADDR, bank, val); } static int inject(xc_interface *xc_handle, struct mce_info *mce, @@ -553,7 +553,7 @@ int main(int argc, char *argv[]) return 0; } } - + if ( domid != DOMID_XEN ) { max_gpa = xs_get_dom_mem(domid); Lprintf("get domain %d max gpa is: 0x%lx", domid, max_gpa); @@ -570,7 +570,7 @@ int main(int argc, char *argv[]) haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); if ( domid == DOMID_XEN ) Lprintf("Xen: mfn=0x%lx, haddr=0x%lx", mfn, haddr); - else + else Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx, mfn=0x%lx, haddr=0x%lx", domid, gaddr, gpfn, mfn, haddr); goto out; @@ -583,7 +583,7 @@ int main(int argc, char *argv[]) inject(xc_handle, &mce_table[type], cpu_nr, domid, gaddr); -out: + out: xc_interface_close(xc_handle); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:42:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:42:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1P-0003ly-7v; Tue, 22 Sep 2015 10:42:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1M-0003li-Re for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:01 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E4/8E-22089-87031065; Tue, 22 Sep 2015 10:42:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1442918518!31460029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31727 invoked from network); 22 Sep 2015 10:41:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1K-0007lH-1M for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL1J-0003Mg-PZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:58 +0000 Date: Tue, 22 Sep 2015 10:41:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mce: translate passed-in GPA to host machine address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 26646f34c31f663fa23076ed0433195edec50d9f Author: Haozhong Zhang AuthorDate: Wed Sep 16 11:40:26 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:40:26 2015 +0200 x86/mce: translate passed-in GPA to host machine address This patch adds a new flag MC_MSRINJ_F_GPADDR to xen_mc_msrinject.mcinj_flags, and makes do_mca() to translate the guest physical address passed-in through xen_mc_msrinject.mcinj_msr[i].value to the host machine address if this flag is present. Signed-off-by: Haozhong Zhang Acked-by: Christoph Egger --- xen/arch/x86/cpu/mcheck/mce.c | 56 ++++++++++++++++++++++++++++----- xen/include/public/arch-x86/xen-mca.h | 5 ++- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 561257d..08cd3f2 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "mce.h" #include "barrier.h" @@ -48,14 +49,15 @@ struct mca_banks *mca_allbanks; #define _MC_MSRINJ_F_REQ_HWCR_WREN (1 << 16) #if 0 -static int x86_mcerr(const char *msg, int err) -{ - gdprintk(XENLOG_WARNING, "x86_mcerr: %s, returning %d\n", - msg != NULL ? msg : "", err); - return err; -} +#define x86_mcerr(fmt, err, args...) \ + ({ \ + int _err = (err); \ + gdprintk(XENLOG_WARNING, "x86_mcerr: " fmt ", returning %d\n", \ + ## args, _err); \ + _err; \ + }) #else -#define x86_mcerr(msg, err) (err) +#define x86_mcerr(fmt, err, args...) (err) #endif int mce_verbosity; @@ -1307,7 +1309,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) ret = xsm_do_mca(XSM_PRIV); if ( ret ) - return x86_mcerr(NULL, ret); + return x86_mcerr("", ret); if ( copy_from_guest(op, u_xen_mc, 1) ) return x86_mcerr("do_mca: failed copyin of xen_mc_t", -EFAULT); @@ -1422,6 +1424,44 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if (mc_msrinject->mcinj_count == 0) return 0; + if ( mc_msrinject->mcinj_flags & MC_MSRINJ_F_GPADDR ) + { + struct domain *d; + struct mcinfo_msr *msr; + unsigned int i; + paddr_t gaddr; + unsigned long gfn, mfn; + p2m_type_t t; + + d = get_domain_by_id(mc_msrinject->mcinj_domid); + if ( d == NULL ) + return x86_mcerr("do_mca inject: bad domain id %d", + -EINVAL, mc_msrinject->mcinj_domid); + + for ( i = 0, msr = &mc_msrinject->mcinj_msr[0]; + i < mc_msrinject->mcinj_count; + i++, msr++ ) + { + gaddr = msr->value; + gfn = PFN_DOWN(gaddr); + mfn = mfn_x(get_gfn(d, gfn, &t)); + + if ( mfn == INVALID_MFN ) + { + put_gfn(d, gfn); + put_domain(d); + return x86_mcerr("do_mca inject: bad gfn %#lx of domain %d", + -EINVAL, gfn, mc_msrinject->mcinj_domid); + } + + msr->value = pfn_to_paddr(mfn) | (gaddr & (PAGE_SIZE - 1)); + + put_gfn(d, gfn); + } + + put_domain(d); + } + if (!x86_mc_msrinject_verify(mc_msrinject)) return x86_mcerr("do_mca inject: illegal MSR", -EINVAL); diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index ec1237a..a97e821 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -392,12 +392,15 @@ struct xen_mc_msrinject { uint32_t mcinj_cpunr; /* target processor id */ uint32_t mcinj_flags; /* see MC_MSRINJ_F_* below */ uint32_t mcinj_count; /* 0 .. count-1 in array are valid */ - uint32_t _pad0; + domid_t mcinj_domid; /* valid only if MC_MSRINJ_F_GPADDR is + present in mcinj_flags */ + uint16_t _pad0; struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS]; }; /* Flags for mcinj_flags above; bits 16-31 are reserved */ #define MC_MSRINJ_F_INTERPOSE 0x1 +#define MC_MSRINJ_F_GPADDR 0x2 #define XEN_MC_mceinject 5 struct xen_mc_mceinject { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:42:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:42:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1P-0003ly-7v; Tue, 22 Sep 2015 10:42:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1M-0003li-Re for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:01 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E4/8E-22089-87031065; Tue, 22 Sep 2015 10:42:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1442918518!31460029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31727 invoked from network); 22 Sep 2015 10:41:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:41:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1K-0007lH-1M for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL1J-0003Mg-PZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:41:58 +0000 Date: Tue, 22 Sep 2015 10:41:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mce: translate passed-in GPA to host machine address X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 26646f34c31f663fa23076ed0433195edec50d9f Author: Haozhong Zhang AuthorDate: Wed Sep 16 11:40:26 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:40:26 2015 +0200 x86/mce: translate passed-in GPA to host machine address This patch adds a new flag MC_MSRINJ_F_GPADDR to xen_mc_msrinject.mcinj_flags, and makes do_mca() to translate the guest physical address passed-in through xen_mc_msrinject.mcinj_msr[i].value to the host machine address if this flag is present. Signed-off-by: Haozhong Zhang Acked-by: Christoph Egger --- xen/arch/x86/cpu/mcheck/mce.c | 56 ++++++++++++++++++++++++++++----- xen/include/public/arch-x86/xen-mca.h | 5 ++- 2 files changed, 52 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 561257d..08cd3f2 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -21,6 +21,7 @@ #include #include #include +#include #include "mce.h" #include "barrier.h" @@ -48,14 +49,15 @@ struct mca_banks *mca_allbanks; #define _MC_MSRINJ_F_REQ_HWCR_WREN (1 << 16) #if 0 -static int x86_mcerr(const char *msg, int err) -{ - gdprintk(XENLOG_WARNING, "x86_mcerr: %s, returning %d\n", - msg != NULL ? msg : "", err); - return err; -} +#define x86_mcerr(fmt, err, args...) \ + ({ \ + int _err = (err); \ + gdprintk(XENLOG_WARNING, "x86_mcerr: " fmt ", returning %d\n", \ + ## args, _err); \ + _err; \ + }) #else -#define x86_mcerr(msg, err) (err) +#define x86_mcerr(fmt, err, args...) (err) #endif int mce_verbosity; @@ -1307,7 +1309,7 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) ret = xsm_do_mca(XSM_PRIV); if ( ret ) - return x86_mcerr(NULL, ret); + return x86_mcerr("", ret); if ( copy_from_guest(op, u_xen_mc, 1) ) return x86_mcerr("do_mca: failed copyin of xen_mc_t", -EFAULT); @@ -1422,6 +1424,44 @@ long do_mca(XEN_GUEST_HANDLE_PARAM(xen_mc_t) u_xen_mc) if (mc_msrinject->mcinj_count == 0) return 0; + if ( mc_msrinject->mcinj_flags & MC_MSRINJ_F_GPADDR ) + { + struct domain *d; + struct mcinfo_msr *msr; + unsigned int i; + paddr_t gaddr; + unsigned long gfn, mfn; + p2m_type_t t; + + d = get_domain_by_id(mc_msrinject->mcinj_domid); + if ( d == NULL ) + return x86_mcerr("do_mca inject: bad domain id %d", + -EINVAL, mc_msrinject->mcinj_domid); + + for ( i = 0, msr = &mc_msrinject->mcinj_msr[0]; + i < mc_msrinject->mcinj_count; + i++, msr++ ) + { + gaddr = msr->value; + gfn = PFN_DOWN(gaddr); + mfn = mfn_x(get_gfn(d, gfn, &t)); + + if ( mfn == INVALID_MFN ) + { + put_gfn(d, gfn); + put_domain(d); + return x86_mcerr("do_mca inject: bad gfn %#lx of domain %d", + -EINVAL, gfn, mc_msrinject->mcinj_domid); + } + + msr->value = pfn_to_paddr(mfn) | (gaddr & (PAGE_SIZE - 1)); + + put_gfn(d, gfn); + } + + put_domain(d); + } + if (!x86_mc_msrinject_verify(mc_msrinject)) return x86_mcerr("do_mca inject: illegal MSR", -EINVAL); diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index ec1237a..a97e821 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -392,12 +392,15 @@ struct xen_mc_msrinject { uint32_t mcinj_cpunr; /* target processor id */ uint32_t mcinj_flags; /* see MC_MSRINJ_F_* below */ uint32_t mcinj_count; /* 0 .. count-1 in array are valid */ - uint32_t _pad0; + domid_t mcinj_domid; /* valid only if MC_MSRINJ_F_GPADDR is + present in mcinj_flags */ + uint16_t _pad0; struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS]; }; /* Flags for mcinj_flags above; bits 16-31 are reserved */ #define MC_MSRINJ_F_INTERPOSE 0x1 +#define MC_MSRINJ_F_GPADDR 0x2 #define XEN_MC_mceinject 5 struct xen_mc_mceinject { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:42:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:42: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 1ZeL1Z-0003nU-Ab; Tue, 22 Sep 2015 10:42:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1Y-0003nH-6n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:12 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id BC/51-01753-38031065; Tue, 22 Sep 2015 10:42:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918528!46555918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23790 invoked from network); 22 Sep 2015 10:42:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:42:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1U-0007ls-6l for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL1U-0003NN-4h for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:08 +0000 Date: Tue, 22 Sep 2015 10:42:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-mceinj: Pass in GPA when injecting through MSR_MCI_ADDR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ddf474e2b7c045fadeaf765ac6157de745e84d6 Author: Haozhong Zhang AuthorDate: Wed Sep 16 13:35:15 2015 +0800 Commit: Ian Jackson CommitDate: Wed Sep 16 14:43:07 2015 +0100 tools/xen-mceinj: Pass in GPA when injecting through MSR_MCI_ADDR This patch removes the address translation in xen-mceinj which translates the guest physical address passed-in through the argument of '-p' to the host machine address. Instead, xen-mceinj now passes a flag MC_MSRINJ_F_GPADDR to ask do_mca() in the hypervisor to do this translation. Signed-off-by: Haozhong Zhang Acked-by: Wei Liu Acked-by: Christoph Egger Acked-by: Ian Jackson --- tools/tests/mce-test/tools/xen-mceinj.c | 152 ++++++------------------------- 1 files changed, 29 insertions(+), 123 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 71813c6..31cdb04 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -238,12 +238,14 @@ static int add_msr_intpose(xc_interface *xc_handle, uint32_t cpu_nr, uint32_t flags, uint64_t msr, - uint64_t val) + uint64_t val, + domid_t domid) { uint32_t count; if ( (msr_inj.mcinj_count && - (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) || + (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags || + domid != msr_inj.mcinj_domid)) || msr_inj.mcinj_count == MC_MSRINJ_MAXMSRS ) { flush_msr_inj(xc_handle); @@ -255,6 +257,7 @@ static int add_msr_intpose(xc_interface *xc_handle, { msr_inj.mcinj_cpunr = cpu_nr; msr_inj.mcinj_flags = flags; + msr_inj.mcinj_domid = domid; } msr_inj.mcinj_msr[count].reg = msr; msr_inj.mcinj_msr[count].value = val; @@ -268,168 +271,77 @@ static int add_msr_bank_intpose(xc_interface *xc_handle, uint32_t flags, uint32_t type, uint32_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { uint64_t msr; msr = bank_addr(bank, type); if ( msr == INVALID_MSR ) return -1; - return add_msr_intpose(xc_handle, cpu_nr, flags, msr, val); -} - -#define MCE_INVALID_MFN ~0UL -#define mfn_valid(_mfn) (_mfn != MCE_INVALID_MFN) -#define mfn_to_pfn(_mfn) (live_m2p[(_mfn)]) -static uint64_t guest_mfn(xc_interface *xc_handle, - uint32_t domain, - uint64_t gpfn) -{ - xen_pfn_t *live_m2p = NULL; - int ret; - unsigned long hvirt_start; - unsigned int pt_levels; - uint64_t * pfn_buf = NULL; - unsigned long max_mfn = 0; /* max mfn of the whole machine */ - unsigned long m2p_mfn0; - unsigned int guest_width; - long max_gpfn,i; - uint64_t mfn = MCE_INVALID_MFN; - - if ( domain > DOMID_FIRST_RESERVED ) - return MCE_INVALID_MFN; - - /* Get max gpfn */ - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; - if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); - - Lprintf("Maxium gpfn for dom %d is 0x%lx", domain, max_gpfn); - - /* Get max mfn */ - if ( !get_platform_info(xc_handle, domain, - &max_mfn, &hvirt_start, - &pt_levels, &guest_width) ) - err(xc_handle, "Failed to get platform information"); - - /* Get guest's pfn list */ - pfn_buf = calloc(max_gpfn, sizeof(uint64_t)); - if ( !pfn_buf ) - err(xc_handle, "Failed to alloc pfn buf"); - - ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn); - if ( ret < 0 ) { - free(pfn_buf); - err(xc_handle, "Failed to get pfn list %x", ret); - } - - /* Now get the m2p table */ - live_m2p = xc_map_m2p(xc_handle, max_mfn, PROT_READ, &m2p_mfn0); - if ( !live_m2p ) - err(xc_handle, "Failed to map live M2P table"); - - /* match the mapping */ - for ( i = 0; i < max_gpfn; i++ ) - { - uint64_t tmp; - tmp = pfn_buf[i]; - - if (mfn_valid(tmp) && (mfn_to_pfn(tmp) == gpfn)) - { - mfn = tmp; - Lprintf("We get the mfn 0x%lx for this injection", mfn); - break; - } - } - - munmap(live_m2p, M2P_SIZE(max_mfn)); - - free(pfn_buf); - return mfn; -} - -static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle, - uint32_t domain, - uint64_t gfn) -{ - uint64_t index; - long max_gpfn; - - /* If domain is xen, means we want pass index directly */ - if ( domain == DOMID_XEN ) - return gfn; - - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; - if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); - index = gfn % max_gpfn; - - return guest_mfn(xc_handle, domain, index); + return add_msr_intpose(xc_handle, cpu_nr, flags, msr, val, domid); } static int inject_mcg_status(xc_interface *xc_handle, uint32_t cpu_nr, - uint64_t val) + uint64_t val, + domid_t domid) { return add_msr_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MSR_IA32_MCG_STATUS, val); + MSR_IA32_MCG_STATUS, val, domid); } static int inject_mci_status(xc_interface *xc_handle, uint32_t cpu_nr, uint64_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_STATUS, bank, val); + MCi_type_STATUS, bank, val, domid); } static int inject_mci_misc(xc_interface *xc_handle, uint32_t cpu_nr, uint64_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_MISC, bank, val); + MCi_type_MISC, bank, val, domid); } static int inject_mci_addr(xc_interface *xc_handle, uint32_t cpu_nr, uint64_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { - return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_ADDR, bank, val); + return add_msr_bank_intpose(xc_handle, cpu_nr, + MC_MSRINJ_F_INTERPOSE | MC_MSRINJ_F_GPADDR, + MCi_type_ADDR, bank, val, domid); } static int inject(xc_interface *xc_handle, struct mce_info *mce, uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { - uint64_t gpfn, mfn, haddr; int ret = 0; - ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat); + ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat, domain); if ( ret ) err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, - mce->bank, mce->mci_stat); + mce->bank, mce->mci_stat, domain); if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, - mce->bank, mce->mci_misc); + mce->bank, mce->mci_misc, domain); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR"); - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, haddr); + ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, gaddr, domain); if ( ret ) err(xc_handle, "Failed to inject MCi_ADDR MSR"); @@ -507,7 +419,7 @@ int main(int argc, char *argv[]) uint32_t domid; xc_interface *xc_handle; int cpu_nr; - int64_t gaddr, gpfn, mfn, haddr, max_gpa; + uint64_t gaddr, max_gpa; /* Default Value */ domid = DOMID_XEN; @@ -563,16 +475,10 @@ int main(int argc, char *argv[]) Lprintf("get gaddr of error inject is: 0x%lx", gaddr); if ( dump ) { - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domid, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); if ( domid == DOMID_XEN ) - Lprintf("Xen: mfn=0x%lx, haddr=0x%lx", mfn, haddr); + Lprintf("Xen: gaddr=0x%lx", gaddr); else - Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx, mfn=0x%lx, haddr=0x%lx", - domid, gaddr, gpfn, mfn, haddr); + Lprintf("Dom%d: gaddr=0x%lx", domid, gaddr); goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:42:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:42: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 1ZeL1Z-0003nU-Ab; Tue, 22 Sep 2015 10:42:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1Y-0003nH-6n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:12 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id BC/51-01753-38031065; Tue, 22 Sep 2015 10:42:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442918528!46555918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23790 invoked from network); 22 Sep 2015 10:42:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:42:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1U-0007ls-6l for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL1U-0003NN-4h for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:08 +0000 Date: Tue, 22 Sep 2015 10:42:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-mceinj: Pass in GPA when injecting through MSR_MCI_ADDR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ddf474e2b7c045fadeaf765ac6157de745e84d6 Author: Haozhong Zhang AuthorDate: Wed Sep 16 13:35:15 2015 +0800 Commit: Ian Jackson CommitDate: Wed Sep 16 14:43:07 2015 +0100 tools/xen-mceinj: Pass in GPA when injecting through MSR_MCI_ADDR This patch removes the address translation in xen-mceinj which translates the guest physical address passed-in through the argument of '-p' to the host machine address. Instead, xen-mceinj now passes a flag MC_MSRINJ_F_GPADDR to ask do_mca() in the hypervisor to do this translation. Signed-off-by: Haozhong Zhang Acked-by: Wei Liu Acked-by: Christoph Egger Acked-by: Ian Jackson --- tools/tests/mce-test/tools/xen-mceinj.c | 152 ++++++------------------------- 1 files changed, 29 insertions(+), 123 deletions(-) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 71813c6..31cdb04 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -238,12 +238,14 @@ static int add_msr_intpose(xc_interface *xc_handle, uint32_t cpu_nr, uint32_t flags, uint64_t msr, - uint64_t val) + uint64_t val, + domid_t domid) { uint32_t count; if ( (msr_inj.mcinj_count && - (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags)) || + (cpu_nr != msr_inj.mcinj_cpunr || flags != msr_inj.mcinj_flags || + domid != msr_inj.mcinj_domid)) || msr_inj.mcinj_count == MC_MSRINJ_MAXMSRS ) { flush_msr_inj(xc_handle); @@ -255,6 +257,7 @@ static int add_msr_intpose(xc_interface *xc_handle, { msr_inj.mcinj_cpunr = cpu_nr; msr_inj.mcinj_flags = flags; + msr_inj.mcinj_domid = domid; } msr_inj.mcinj_msr[count].reg = msr; msr_inj.mcinj_msr[count].value = val; @@ -268,168 +271,77 @@ static int add_msr_bank_intpose(xc_interface *xc_handle, uint32_t flags, uint32_t type, uint32_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { uint64_t msr; msr = bank_addr(bank, type); if ( msr == INVALID_MSR ) return -1; - return add_msr_intpose(xc_handle, cpu_nr, flags, msr, val); -} - -#define MCE_INVALID_MFN ~0UL -#define mfn_valid(_mfn) (_mfn != MCE_INVALID_MFN) -#define mfn_to_pfn(_mfn) (live_m2p[(_mfn)]) -static uint64_t guest_mfn(xc_interface *xc_handle, - uint32_t domain, - uint64_t gpfn) -{ - xen_pfn_t *live_m2p = NULL; - int ret; - unsigned long hvirt_start; - unsigned int pt_levels; - uint64_t * pfn_buf = NULL; - unsigned long max_mfn = 0; /* max mfn of the whole machine */ - unsigned long m2p_mfn0; - unsigned int guest_width; - long max_gpfn,i; - uint64_t mfn = MCE_INVALID_MFN; - - if ( domain > DOMID_FIRST_RESERVED ) - return MCE_INVALID_MFN; - - /* Get max gpfn */ - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; - if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); - - Lprintf("Maxium gpfn for dom %d is 0x%lx", domain, max_gpfn); - - /* Get max mfn */ - if ( !get_platform_info(xc_handle, domain, - &max_mfn, &hvirt_start, - &pt_levels, &guest_width) ) - err(xc_handle, "Failed to get platform information"); - - /* Get guest's pfn list */ - pfn_buf = calloc(max_gpfn, sizeof(uint64_t)); - if ( !pfn_buf ) - err(xc_handle, "Failed to alloc pfn buf"); - - ret = xc_get_pfn_list(xc_handle, domain, pfn_buf, max_gpfn); - if ( ret < 0 ) { - free(pfn_buf); - err(xc_handle, "Failed to get pfn list %x", ret); - } - - /* Now get the m2p table */ - live_m2p = xc_map_m2p(xc_handle, max_mfn, PROT_READ, &m2p_mfn0); - if ( !live_m2p ) - err(xc_handle, "Failed to map live M2P table"); - - /* match the mapping */ - for ( i = 0; i < max_gpfn; i++ ) - { - uint64_t tmp; - tmp = pfn_buf[i]; - - if (mfn_valid(tmp) && (mfn_to_pfn(tmp) == gpfn)) - { - mfn = tmp; - Lprintf("We get the mfn 0x%lx for this injection", mfn); - break; - } - } - - munmap(live_m2p, M2P_SIZE(max_mfn)); - - free(pfn_buf); - return mfn; -} - -static uint64_t mca_gpfn_to_mfn(xc_interface *xc_handle, - uint32_t domain, - uint64_t gfn) -{ - uint64_t index; - long max_gpfn; - - /* If domain is xen, means we want pass index directly */ - if ( domain == DOMID_XEN ) - return gfn; - - max_gpfn = do_memory_op(xc_handle, XENMEM_maximum_gpfn, &domain, - sizeof(domain)) + 1; - if ( max_gpfn <= 0 ) - err(xc_handle, "Failed to get max_gpfn 0x%lx", max_gpfn); - index = gfn % max_gpfn; - - return guest_mfn(xc_handle, domain, index); + return add_msr_intpose(xc_handle, cpu_nr, flags, msr, val, domid); } static int inject_mcg_status(xc_interface *xc_handle, uint32_t cpu_nr, - uint64_t val) + uint64_t val, + domid_t domid) { return add_msr_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MSR_IA32_MCG_STATUS, val); + MSR_IA32_MCG_STATUS, val, domid); } static int inject_mci_status(xc_interface *xc_handle, uint32_t cpu_nr, uint64_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_STATUS, bank, val); + MCi_type_STATUS, bank, val, domid); } static int inject_mci_misc(xc_interface *xc_handle, uint32_t cpu_nr, uint64_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_MISC, bank, val); + MCi_type_MISC, bank, val, domid); } static int inject_mci_addr(xc_interface *xc_handle, uint32_t cpu_nr, uint64_t bank, - uint64_t val) + uint64_t val, + domid_t domid) { - return add_msr_bank_intpose(xc_handle, cpu_nr, MC_MSRINJ_F_INTERPOSE, - MCi_type_ADDR, bank, val); + return add_msr_bank_intpose(xc_handle, cpu_nr, + MC_MSRINJ_F_INTERPOSE | MC_MSRINJ_F_GPADDR, + MCi_type_ADDR, bank, val, domid); } static int inject(xc_interface *xc_handle, struct mce_info *mce, uint32_t cpu_nr, uint32_t domain, uint64_t gaddr) { - uint64_t gpfn, mfn, haddr; int ret = 0; - ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat); + ret = inject_mcg_status(xc_handle, cpu_nr, mce->mcg_stat, domain); if ( ret ) err(xc_handle, "Failed to inject MCG_STATUS MSR"); ret = inject_mci_status(xc_handle, cpu_nr, - mce->bank, mce->mci_stat); + mce->bank, mce->mci_stat, domain); if ( ret ) err(xc_handle, "Failed to inject MCi_STATUS MSR"); ret = inject_mci_misc(xc_handle, cpu_nr, - mce->bank, mce->mci_misc); + mce->bank, mce->mci_misc, domain); if ( ret ) err(xc_handle, "Failed to inject MCi_MISC MSR"); - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domain, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); - ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, haddr); + ret = inject_mci_addr(xc_handle, cpu_nr, mce->bank, gaddr, domain); if ( ret ) err(xc_handle, "Failed to inject MCi_ADDR MSR"); @@ -507,7 +419,7 @@ int main(int argc, char *argv[]) uint32_t domid; xc_interface *xc_handle; int cpu_nr; - int64_t gaddr, gpfn, mfn, haddr, max_gpa; + uint64_t gaddr, max_gpa; /* Default Value */ domid = DOMID_XEN; @@ -563,16 +475,10 @@ int main(int argc, char *argv[]) Lprintf("get gaddr of error inject is: 0x%lx", gaddr); if ( dump ) { - gpfn = gaddr >> PAGE_SHIFT; - mfn = mca_gpfn_to_mfn(xc_handle, domid, gpfn); - if (!mfn_valid(mfn)) - err(xc_handle, "The MFN is not valid"); - haddr = (mfn << PAGE_SHIFT) | (gaddr & (PAGE_SIZE - 1)); if ( domid == DOMID_XEN ) - Lprintf("Xen: mfn=0x%lx, haddr=0x%lx", mfn, haddr); + Lprintf("Xen: gaddr=0x%lx", gaddr); else - Lprintf("Dom%d: gaddr=0x%lx, gpfn=0x%lx, mfn=0x%lx, haddr=0x%lx", - domid, gaddr, gpfn, mfn, haddr); + Lprintf("Dom%d: gaddr=0x%lx", domid, gaddr); goto out; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:42:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:42:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1i-0003pE-Fn; Tue, 22 Sep 2015 10:42:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1g-0003ov-N2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:20 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 7C/A2-10678-B8031065; Tue, 22 Sep 2015 10:42:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442918538!46486712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26628 invoked from network); 22 Sep 2015 10:42:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:42:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1e-0007m0-Bu for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL1e-0003Np-AR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:18 +0000 Date: Tue, 22 Sep 2015 10:42:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4600d7560425f89b32cd90ecf6084bae9293dfab Author: Chunyan Liu AuthorDate: Wed Sep 16 14:16:09 2015 +0800 Commit: Ian Campbell CommitDate: Thu Sep 17 12:14:02 2015 +0100 libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore Run "xl pci-attach ", the 2nd time fails: xl: libxl_xshelp.c:209: libxl__xs_transaction_start: Assertion `!*t' failed. Aborted To fix that, initialize xs_transaction to avoid libxl__xs_transaction_start assertion error. Signed-off-by: Chunyan Liu Acked-by: Ian Campbell [ ijc -- updated commit message ] --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index bb54426..7229a36 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -123,7 +123,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d flexarray_t *back; char *num_devs, *be_path; int num = 0; - xs_transaction_t t; + xs_transaction_t t = XBT_NULL; libxl__device *device; int rc; libxl_domain_config d_config; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 10:42:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 10:42:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1i-0003pE-Fn; Tue, 22 Sep 2015 10:42:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1g-0003ov-N2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:20 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 7C/A2-10678-B8031065; Tue, 22 Sep 2015 10:42:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1442918538!46486712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26628 invoked from network); 22 Sep 2015 10:42:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 10:42:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeL1e-0007m0-Bu for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeL1e-0003Np-AR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 10:42:18 +0000 Date: Tue, 22 Sep 2015 10:42:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4600d7560425f89b32cd90ecf6084bae9293dfab Author: Chunyan Liu AuthorDate: Wed Sep 16 14:16:09 2015 +0800 Commit: Ian Campbell CommitDate: Thu Sep 17 12:14:02 2015 +0100 libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore Run "xl pci-attach ", the 2nd time fails: xl: libxl_xshelp.c:209: libxl__xs_transaction_start: Assertion `!*t' failed. Aborted To fix that, initialize xs_transaction to avoid libxl__xs_transaction_start assertion error. Signed-off-by: Chunyan Liu Acked-by: Ian Campbell [ ijc -- updated commit message ] --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index bb54426..7229a36 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -123,7 +123,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d flexarray_t *back; char *num_devs, *be_path; int num = 0; - xs_transaction_t t; + xs_transaction_t t = XBT_NULL; libxl__device *device; int rc; libxl_domain_config d_config; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00: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 1ZeRrM-00018P-8i; Tue, 22 Sep 2015 18:00:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrK-00018K-Pd for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:06 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id BD/E4-16965-62791065; Tue, 22 Sep 2015 18:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442944804!45411417!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23658 invoked from network); 22 Sep 2015 18:00: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; 22 Sep 2015 18:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrH-0004JL-9i for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrH-0008Of-7a for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:03 +0000 Date: Tue, 22 Sep 2015 18:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/gdt: Drop write-only, xalloc()'d array from set_gdt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12afed3c90a3f56cd3b6376992cfcb849aa8f3f9 Author: Andrew Cooper AuthorDate: Thu Sep 10 15:29:31 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:29:31 2015 +0200 x86/gdt: Drop write-only, xalloc()'d array from set_gdt() It is not used, and can cause a spurious failure of the set_gdt() hypercall in low memory situations. Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Ian Campbell Reviewed-by: George Dunlap master commit: a7bd9b1661304500cd18b7d216d616ecf053ebdb master date: 2015-08-05 10:32:45 +0100 --- xen/arch/x86/mm.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 262d59e..59e16a6 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4358,20 +4358,15 @@ long set_gdt(struct vcpu *v, l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; - unsigned long mfn, *pfns; if ( entries > FIRST_RESERVED_GDT_ENTRY ) return -EINVAL; - pfns = xmalloc_array(unsigned long, nr_pages); - if ( !pfns ) - return -ENOMEM; - /* Check the pages in the new GDT. */ for ( i = 0; i < nr_pages; i++ ) { struct page_info *page; - pfns[i] = frames[i]; + page = get_page_from_gfn(d, frames[i], NULL, P2M_ALLOC); if ( !page ) goto fail; @@ -4380,7 +4375,7 @@ long set_gdt(struct vcpu *v, put_page(page); goto fail; } - mfn = frames[i] = page_to_mfn(page); + frames[i] = page_to_mfn(page); } /* Tear down the old GDT. */ @@ -4395,7 +4390,6 @@ long set_gdt(struct vcpu *v, l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); } - xfree(pfns); return 0; fail: @@ -4403,7 +4397,6 @@ long set_gdt(struct vcpu *v, { put_page_and_type(mfn_to_page(frames[i])); } - xfree(pfns); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00: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 1ZeRrM-00018P-8i; Tue, 22 Sep 2015 18:00:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrK-00018K-Pd for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:06 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id BD/E4-16965-62791065; Tue, 22 Sep 2015 18:00:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1442944804!45411417!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23658 invoked from network); 22 Sep 2015 18:00: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; 22 Sep 2015 18:00:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrH-0004JL-9i for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrH-0008Of-7a for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:03 +0000 Date: Tue, 22 Sep 2015 18:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/gdt: Drop write-only, xalloc()'d array from set_gdt() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12afed3c90a3f56cd3b6376992cfcb849aa8f3f9 Author: Andrew Cooper AuthorDate: Thu Sep 10 15:29:31 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:29:31 2015 +0200 x86/gdt: Drop write-only, xalloc()'d array from set_gdt() It is not used, and can cause a spurious failure of the set_gdt() hypercall in low memory situations. Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Ian Campbell Reviewed-by: George Dunlap master commit: a7bd9b1661304500cd18b7d216d616ecf053ebdb master date: 2015-08-05 10:32:45 +0100 --- xen/arch/x86/mm.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 262d59e..59e16a6 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4358,20 +4358,15 @@ long set_gdt(struct vcpu *v, l1_pgentry_t *pl1e; /* NB. There are 512 8-byte entries per GDT page. */ int i, nr_pages = (entries + 511) / 512; - unsigned long mfn, *pfns; if ( entries > FIRST_RESERVED_GDT_ENTRY ) return -EINVAL; - pfns = xmalloc_array(unsigned long, nr_pages); - if ( !pfns ) - return -ENOMEM; - /* Check the pages in the new GDT. */ for ( i = 0; i < nr_pages; i++ ) { struct page_info *page; - pfns[i] = frames[i]; + page = get_page_from_gfn(d, frames[i], NULL, P2M_ALLOC); if ( !page ) goto fail; @@ -4380,7 +4375,7 @@ long set_gdt(struct vcpu *v, put_page(page); goto fail; } - mfn = frames[i] = page_to_mfn(page); + frames[i] = page_to_mfn(page); } /* Tear down the old GDT. */ @@ -4395,7 +4390,6 @@ long set_gdt(struct vcpu *v, l1e_write(&pl1e[i], l1e_from_pfn(frames[i], __PAGE_HYPERVISOR)); } - xfree(pfns); return 0; fail: @@ -4403,7 +4397,6 @@ long set_gdt(struct vcpu *v, { put_page_and_type(mfn_to_page(frames[i])); } - xfree(pfns); return -EINVAL; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00: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 1ZeRrY-00019H-BZ; Tue, 22 Sep 2015 18:00:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrX-000195-4d for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:19 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 55/E9-24494-13791065; Tue, 22 Sep 2015 18:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442944815!36985797!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30623 invoked from network); 22 Sep 2015 18:00:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrT-0004JT-CZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrS-0008PJ-Ft for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:15 +0000 Date: Tue, 22 Sep 2015 18:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/mm: Make {hap, shadow}_teardown() 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 9e6379ed39a53870a749230410ed9cfdd88348cf Author: Anshul Makkar AuthorDate: Thu Sep 10 15:30:36 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:30:36 2015 +0200 x86/mm: Make {hap, shadow}_teardown() preemptible A domain with sufficient shadow allocation can cause a watchdog timeout during domain destruction. Expand the existing -ERESTART logic in paging_teardown() to allow {hap/sh}_set_allocation() to become restartable during the DOMCTL_destroydomain hypercall. Signed-off-by: Anshul Makkar Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: George Dunlap master commit: 0174da5b79752e2d5d6ca0faed89536e8f3d91c7 master date: 2015-08-06 10:04:43 +0100 --- xen/arch/x86/mm/hap/hap.c | 22 ++++++++-------------- xen/arch/x86/mm/paging.c | 9 ++++++--- xen/arch/x86/mm/shadow/common.c | 24 +++++++++--------------- xen/include/asm-x86/hap.h | 2 +- xen/include/asm-x86/shadow.h | 2 +- 5 files changed, 25 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index abf3d7a..1843c67 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -503,7 +503,7 @@ void hap_final_teardown(struct domain *d) } if ( d->arch.paging.hap.total_pages != 0 ) - hap_teardown(d); + hap_teardown(d, NULL); p2m_teardown(p2m_get_hostp2m(d)); /* Free any memory that the p2m teardown released */ @@ -513,7 +513,7 @@ void hap_final_teardown(struct domain *d) paging_unlock(d); } -void hap_teardown(struct domain *d) +void hap_teardown(struct domain *d, int *preempted) { struct vcpu *v; mfn_t mfn; @@ -541,18 +541,11 @@ void hap_teardown(struct domain *d) if ( d->arch.paging.hap.total_pages != 0 ) { - HAP_PRINTK("teardown of domain %u starts." - " pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); - hap_set_allocation(d, 0, NULL); - HAP_PRINTK("teardown done." - " pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); + hap_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + ASSERT(d->arch.paging.hap.total_pages == 0); } @@ -561,6 +554,7 @@ void hap_teardown(struct domain *d) xfree(d->arch.hvm_domain.dirty_vram); d->arch.hvm_domain.dirty_vram = NULL; +out: paging_unlock(d); } diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 6b788f7..3b502e8 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -779,12 +779,15 @@ long paging_domctl_continuation(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Call when destroying a domain */ int paging_teardown(struct domain *d) { - int rc; + int rc, preempted = 0; if ( hap_enabled(d) ) - hap_teardown(d); + hap_teardown(d, &preempted); else - shadow_teardown(d); + shadow_teardown(d, &preempted); + + if ( preempted ) + return -ERESTART; /* clean up log dirty resources. */ rc = paging_free_log_dirty_bitmap(d, 0); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index a5eed28..18026fe 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3030,7 +3030,7 @@ int shadow_enable(struct domain *d, u32 mode) return rv; } -void shadow_teardown(struct domain *d) +void shadow_teardown(struct domain *d, int *preempted) /* Destroy the shadow pagetables of this domain and free its shadow memory. * Should only be called for dying domains. */ { @@ -3091,23 +3091,16 @@ void shadow_teardown(struct domain *d) if ( d->arch.paging.shadow.total_pages != 0 ) { - SHADOW_PRINTK("teardown of domain %u starts." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); /* Destroy all the shadows and release memory to domheap */ - sh_set_allocation(d, 0, NULL); + sh_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + /* Release the hash table back to xenheap */ if (d->arch.paging.shadow.hash_table) shadow_hash_teardown(d); - /* Should not have any more memory held */ - SHADOW_PRINTK("teardown done." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); + ASSERT(d->arch.paging.shadow.total_pages == 0); } @@ -3138,6 +3131,7 @@ void shadow_teardown(struct domain *d) d->arch.hvm_domain.dirty_vram = NULL; } +out: paging_unlock(d); /* Must be called outside the lock */ @@ -3159,7 +3153,7 @@ void shadow_final_teardown(struct domain *d) * It is possible for a domain that never got domain_kill()ed * to get here with its shadow allocation intact. */ if ( d->arch.paging.shadow.total_pages != 0 ) - shadow_teardown(d); + shadow_teardown(d, NULL); /* It is now safe to pull down the p2m map. */ p2m_teardown(p2m_get_hostp2m(d)); diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 7876527..df8be38 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -54,7 +54,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); int hap_enable(struct domain *d, u32 mode); void hap_final_teardown(struct domain *d); -void hap_teardown(struct domain *d); +void hap_teardown(struct domain *d, int *preempted); void hap_vcpu_init(struct vcpu *v); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index f40cab4..44dbbf5 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -72,7 +72,7 @@ int shadow_domctl(struct domain *d, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void shadow_teardown(struct domain *d); +void shadow_teardown(struct domain *d, int *preempted); /* Call once all of the references to the domain have gone away */ void shadow_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00: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 1ZeRrY-00019H-BZ; Tue, 22 Sep 2015 18:00:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrX-000195-4d for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:19 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 55/E9-24494-13791065; Tue, 22 Sep 2015 18:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1442944815!36985797!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30623 invoked from network); 22 Sep 2015 18:00:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrT-0004JT-CZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrS-0008PJ-Ft for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:15 +0000 Date: Tue, 22 Sep 2015 18:00:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/mm: Make {hap, shadow}_teardown() 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 9e6379ed39a53870a749230410ed9cfdd88348cf Author: Anshul Makkar AuthorDate: Thu Sep 10 15:30:36 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:30:36 2015 +0200 x86/mm: Make {hap, shadow}_teardown() preemptible A domain with sufficient shadow allocation can cause a watchdog timeout during domain destruction. Expand the existing -ERESTART logic in paging_teardown() to allow {hap/sh}_set_allocation() to become restartable during the DOMCTL_destroydomain hypercall. Signed-off-by: Anshul Makkar Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan Reviewed-by: George Dunlap master commit: 0174da5b79752e2d5d6ca0faed89536e8f3d91c7 master date: 2015-08-06 10:04:43 +0100 --- xen/arch/x86/mm/hap/hap.c | 22 ++++++++-------------- xen/arch/x86/mm/paging.c | 9 ++++++--- xen/arch/x86/mm/shadow/common.c | 24 +++++++++--------------- xen/include/asm-x86/hap.h | 2 +- xen/include/asm-x86/shadow.h | 2 +- 5 files changed, 25 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index abf3d7a..1843c67 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -503,7 +503,7 @@ void hap_final_teardown(struct domain *d) } if ( d->arch.paging.hap.total_pages != 0 ) - hap_teardown(d); + hap_teardown(d, NULL); p2m_teardown(p2m_get_hostp2m(d)); /* Free any memory that the p2m teardown released */ @@ -513,7 +513,7 @@ void hap_final_teardown(struct domain *d) paging_unlock(d); } -void hap_teardown(struct domain *d) +void hap_teardown(struct domain *d, int *preempted) { struct vcpu *v; mfn_t mfn; @@ -541,18 +541,11 @@ void hap_teardown(struct domain *d) if ( d->arch.paging.hap.total_pages != 0 ) { - HAP_PRINTK("teardown of domain %u starts." - " pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); - hap_set_allocation(d, 0, NULL); - HAP_PRINTK("teardown done." - " pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.hap.total_pages, - d->arch.paging.hap.free_pages, - d->arch.paging.hap.p2m_pages); + hap_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + ASSERT(d->arch.paging.hap.total_pages == 0); } @@ -561,6 +554,7 @@ void hap_teardown(struct domain *d) xfree(d->arch.hvm_domain.dirty_vram); d->arch.hvm_domain.dirty_vram = NULL; +out: paging_unlock(d); } diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 6b788f7..3b502e8 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -779,12 +779,15 @@ long paging_domctl_continuation(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) /* Call when destroying a domain */ int paging_teardown(struct domain *d) { - int rc; + int rc, preempted = 0; if ( hap_enabled(d) ) - hap_teardown(d); + hap_teardown(d, &preempted); else - shadow_teardown(d); + shadow_teardown(d, &preempted); + + if ( preempted ) + return -ERESTART; /* clean up log dirty resources. */ rc = paging_free_log_dirty_bitmap(d, 0); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index a5eed28..18026fe 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3030,7 +3030,7 @@ int shadow_enable(struct domain *d, u32 mode) return rv; } -void shadow_teardown(struct domain *d) +void shadow_teardown(struct domain *d, int *preempted) /* Destroy the shadow pagetables of this domain and free its shadow memory. * Should only be called for dying domains. */ { @@ -3091,23 +3091,16 @@ void shadow_teardown(struct domain *d) if ( d->arch.paging.shadow.total_pages != 0 ) { - SHADOW_PRINTK("teardown of domain %u starts." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->domain_id, - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); /* Destroy all the shadows and release memory to domheap */ - sh_set_allocation(d, 0, NULL); + sh_set_allocation(d, 0, preempted); + + if ( preempted && *preempted ) + goto out; + /* Release the hash table back to xenheap */ if (d->arch.paging.shadow.hash_table) shadow_hash_teardown(d); - /* Should not have any more memory held */ - SHADOW_PRINTK("teardown done." - " Shadow pages total = %u, free = %u, p2m=%u\n", - d->arch.paging.shadow.total_pages, - d->arch.paging.shadow.free_pages, - d->arch.paging.shadow.p2m_pages); + ASSERT(d->arch.paging.shadow.total_pages == 0); } @@ -3138,6 +3131,7 @@ void shadow_teardown(struct domain *d) d->arch.hvm_domain.dirty_vram = NULL; } +out: paging_unlock(d); /* Must be called outside the lock */ @@ -3159,7 +3153,7 @@ void shadow_final_teardown(struct domain *d) * It is possible for a domain that never got domain_kill()ed * to get here with its shadow allocation intact. */ if ( d->arch.paging.shadow.total_pages != 0 ) - shadow_teardown(d); + shadow_teardown(d, NULL); /* It is now safe to pull down the p2m map. */ p2m_teardown(p2m_get_hostp2m(d)); diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 7876527..df8be38 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -54,7 +54,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc, XEN_GUEST_HANDLE_PARAM(void) u_domctl); int hap_enable(struct domain *d, u32 mode); void hap_final_teardown(struct domain *d); -void hap_teardown(struct domain *d); +void hap_teardown(struct domain *d, int *preempted); void hap_vcpu_init(struct vcpu *v); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index f40cab4..44dbbf5 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -72,7 +72,7 @@ int shadow_domctl(struct domain *d, XEN_GUEST_HANDLE_PARAM(void) u_domctl); /* Call when destroying a domain */ -void shadow_teardown(struct domain *d); +void shadow_teardown(struct domain *d, int *preempted); /* Call once all of the references to the domain have gone away */ void shadow_final_teardown(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrh-0001AK-E6; Tue, 22 Sep 2015 18:00:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrg-0001A9-42 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id B1/9B-09570-B3791065; Tue, 22 Sep 2015 18:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442944825!15472005!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13402 invoked from network); 22 Sep 2015 18:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrd-0004Jb-Id for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrd-0008Pl-GR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:25 +0000 Date: Tue, 22 Sep 2015 18:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] mm: populate_physmap: validate correctly the gfn for direct mapped 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 fabd2cffef1eaf94159b941edb1dc05c8cf20597 Author: Julien Grall AuthorDate: Thu Sep 10 15:31:30 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:31:30 2015 +0200 mm: populate_physmap: validate correctly the gfn for direct mapped domain Direct mapped domain has already the memory allocated 1:1, so we are directly using the gfn as mfn to map the RAM in the guest. While we are validating that the page associated to the first mfn belongs to the domain, the subsequent MFN are not validated when the extent_order is > 0. This may result to map memory region (MMIO, RAM) which doesn't belong to the domain. Although, only DOM0 on ARM is using a direct memory mapped. So it doesn't affect any guest (at least on the upstream version) or even x86. Signed-off-by: Julien Grall Reviewed-by: Jan Beulich Release-acked-by: Wei Liu Acked-by: Ian Campbell master commit: 9503ab0e9c6a41a1ee7a70c8ea9313d08ebaa8c5 master date: 2015-08-13 14:41:09 +0200 --- xen/common/memory.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e84ace9..29986a6 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -126,22 +126,28 @@ static void populate_physmap(struct memop_args *a) if ( is_domain_direct_mapped(d) ) { mfn = gpfn; - if ( !mfn_valid(mfn) ) - { - gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", - mfn); - goto out; - } - page = mfn_to_page(mfn); - if ( !get_page(page, d) ) + for ( j = 0; j < (1U << a->extent_order); j++, mfn++ ) { - gdprintk(XENLOG_INFO, - "mfn %#"PRI_xen_pfn" doesn't belong to the" - " domain\n", mfn); - goto out; + if ( !mfn_valid(mfn) ) + { + gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", + mfn); + goto out; + } + + page = mfn_to_page(mfn); + if ( !get_page(page, d) ) + { + gdprintk(XENLOG_INFO, + "mfn %#"PRI_xen_pfn" doesn't belong to the" + " domain\n", mfn); + goto out; + } + put_page(page); } - put_page(page); + + page = mfn_to_page(gpfn); } else page = alloc_domheap_pages(d, a->extent_order, a->memflags); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrh-0001AK-E6; Tue, 22 Sep 2015 18:00:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrg-0001A9-42 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:28 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id B1/9B-09570-B3791065; Tue, 22 Sep 2015 18:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442944825!15472005!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13402 invoked from network); 22 Sep 2015 18:00:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrd-0004Jb-Id for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrd-0008Pl-GR for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:25 +0000 Date: Tue, 22 Sep 2015 18:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] mm: populate_physmap: validate correctly the gfn for direct mapped 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 fabd2cffef1eaf94159b941edb1dc05c8cf20597 Author: Julien Grall AuthorDate: Thu Sep 10 15:31:30 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:31:30 2015 +0200 mm: populate_physmap: validate correctly the gfn for direct mapped domain Direct mapped domain has already the memory allocated 1:1, so we are directly using the gfn as mfn to map the RAM in the guest. While we are validating that the page associated to the first mfn belongs to the domain, the subsequent MFN are not validated when the extent_order is > 0. This may result to map memory region (MMIO, RAM) which doesn't belong to the domain. Although, only DOM0 on ARM is using a direct memory mapped. So it doesn't affect any guest (at least on the upstream version) or even x86. Signed-off-by: Julien Grall Reviewed-by: Jan Beulich Release-acked-by: Wei Liu Acked-by: Ian Campbell master commit: 9503ab0e9c6a41a1ee7a70c8ea9313d08ebaa8c5 master date: 2015-08-13 14:41:09 +0200 --- xen/common/memory.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e84ace9..29986a6 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -126,22 +126,28 @@ static void populate_physmap(struct memop_args *a) if ( is_domain_direct_mapped(d) ) { mfn = gpfn; - if ( !mfn_valid(mfn) ) - { - gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", - mfn); - goto out; - } - page = mfn_to_page(mfn); - if ( !get_page(page, d) ) + for ( j = 0; j < (1U << a->extent_order); j++, mfn++ ) { - gdprintk(XENLOG_INFO, - "mfn %#"PRI_xen_pfn" doesn't belong to the" - " domain\n", mfn); - goto out; + if ( !mfn_valid(mfn) ) + { + gdprintk(XENLOG_INFO, "Invalid mfn %#"PRI_xen_pfn"\n", + mfn); + goto out; + } + + page = mfn_to_page(mfn); + if ( !get_page(page, d) ) + { + gdprintk(XENLOG_INFO, + "mfn %#"PRI_xen_pfn" doesn't belong to the" + " domain\n", mfn); + goto out; + } + put_page(page); } - put_page(page); + + page = mfn_to_page(gpfn); } else page = alloc_domheap_pages(d, a->extent_order, a->memflags); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrr-0001CQ-H0; Tue, 22 Sep 2015 18:00:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrq-0001C5-MZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:38 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 57/D3-03763-54791065; Tue, 22 Sep 2015 18:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442944836!15472045!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14470 invoked from network); 22 Sep 2015 18:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrn-0004Jj-Sl for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrn-0008QD-M0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:35 +0000 Date: Tue, 22 Sep 2015 18:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86, amd_ucode: skip microcode updates for final levels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b7198822921e0c8a9c2ff140e3fe52a1b974844 Author: Aravind Gopalakrishnan AuthorDate: Thu Sep 10 15:32:13 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:32:13 2015 +0200 x86, amd_ucode: skip microcode updates for final levels Some of older[Fam10h] systems require that certain number of applied microcode patch levels should not be overwritten by the microcode loader. Otherwise, system hangs are known to occur. The 'final_levels' of patch ids have been obtained empirically. Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 for details of the issue. The short version is that people have predominantly noticed system hang issues when trying to update microcode levels beyond the patch IDs below. [0x01000098, 0x0100009f, 0x010000af] From internal discussions, we gathered that OS/hypervisor cannot reliably perform microcode updates beyond these levels due to hardware issues. Therefore, we need to abort microcode update process if we hit any of these levels. In this patch, we check for those microcode versions and abort if the current core has one of those final patch levels applied by the BIOS A linux version of the patch has already made it into tip- http://marc.info/?l=linux-kernel&m=143703405627170 Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky master commit: 22c5675877c8209adcfdb6bceddb561320374529 master date: 2015-08-25 16:17:13 +0200 --- xen/arch/x86/microcode_amd.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index f79b397..d6339d0 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -347,6 +347,43 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of return 0; } +/* + * The 'final_levels' of patch ids have been obtained empirically. + * Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 + * for details of the issue. The short version is that people + * using certain Fam10h systems noticed system hang issues when + * trying to update microcode levels beyond the patch IDs below. + * From internal discussions, we gathered that OS/hypervisor + * cannot reliably perform microcode updates beyond these levels + * due to hardware issues. Therefore, we need to abort microcode + * update process if we hit any of these levels. + */ +static const unsigned int final_levels[] = { + 0x01000098, + 0x0100009f, + 0x010000af +}; + +static bool_t check_final_patch_levels(unsigned int cpu) +{ + /* + * Check the current patch levels on the cpu. If they are equal to + * any of the 'final_levels', then we should not update the microcode + * patch on the cpu as system will hang otherwise. + */ + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); + unsigned int i; + + if ( boot_cpu_data.x86 != 0x10 ) + return 0; + + for ( i = 0; i < ARRAY_SIZE(final_levels); i++ ) + if ( uci->cpu_sig.rev == final_levels[i] ) + return 1; + + return 0; +} + static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) { struct microcode_amd *mc_amd, *mc_old; @@ -369,6 +406,14 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) goto out; } + if ( check_final_patch_levels(cpu) ) + { + printk(XENLOG_INFO + "microcode: Cannot update microcode patch on the cpu as we hit a final level\n"); + error = -EPERM; + goto out; + } + mc_amd = xmalloc(struct microcode_amd); if ( !mc_amd ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrr-0001CQ-H0; Tue, 22 Sep 2015 18:00:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrq-0001C5-MZ for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:38 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 57/D3-03763-54791065; Tue, 22 Sep 2015 18:00:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442944836!15472045!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14470 invoked from network); 22 Sep 2015 18:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrn-0004Jj-Sl for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRrn-0008QD-M0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:35 +0000 Date: Tue, 22 Sep 2015 18:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86, amd_ucode: skip microcode updates for final levels X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b7198822921e0c8a9c2ff140e3fe52a1b974844 Author: Aravind Gopalakrishnan AuthorDate: Thu Sep 10 15:32:13 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:32:13 2015 +0200 x86, amd_ucode: skip microcode updates for final levels Some of older[Fam10h] systems require that certain number of applied microcode patch levels should not be overwritten by the microcode loader. Otherwise, system hangs are known to occur. The 'final_levels' of patch ids have been obtained empirically. Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 for details of the issue. The short version is that people have predominantly noticed system hang issues when trying to update microcode levels beyond the patch IDs below. [0x01000098, 0x0100009f, 0x010000af] From internal discussions, we gathered that OS/hypervisor cannot reliably perform microcode updates beyond these levels due to hardware issues. Therefore, we need to abort microcode update process if we hit any of these levels. In this patch, we check for those microcode versions and abort if the current core has one of those final patch levels applied by the BIOS A linux version of the patch has already made it into tip- http://marc.info/?l=linux-kernel&m=143703405627170 Signed-off-by: Aravind Gopalakrishnan Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky master commit: 22c5675877c8209adcfdb6bceddb561320374529 master date: 2015-08-25 16:17:13 +0200 --- xen/arch/x86/microcode_amd.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index f79b397..d6339d0 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -347,6 +347,43 @@ static int container_fast_forward(const void *data, size_t size_left, size_t *of return 0; } +/* + * The 'final_levels' of patch ids have been obtained empirically. + * Refer bug https://bugzilla.suse.com/show_bug.cgi?id=913996 + * for details of the issue. The short version is that people + * using certain Fam10h systems noticed system hang issues when + * trying to update microcode levels beyond the patch IDs below. + * From internal discussions, we gathered that OS/hypervisor + * cannot reliably perform microcode updates beyond these levels + * due to hardware issues. Therefore, we need to abort microcode + * update process if we hit any of these levels. + */ +static const unsigned int final_levels[] = { + 0x01000098, + 0x0100009f, + 0x010000af +}; + +static bool_t check_final_patch_levels(unsigned int cpu) +{ + /* + * Check the current patch levels on the cpu. If they are equal to + * any of the 'final_levels', then we should not update the microcode + * patch on the cpu as system will hang otherwise. + */ + struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu); + unsigned int i; + + if ( boot_cpu_data.x86 != 0x10 ) + return 0; + + for ( i = 0; i < ARRAY_SIZE(final_levels); i++ ) + if ( uci->cpu_sig.rev == final_levels[i] ) + return 1; + + return 0; +} + static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) { struct microcode_amd *mc_amd, *mc_old; @@ -369,6 +406,14 @@ static int cpu_request_microcode(int cpu, const void *buf, size_t bufsize) goto out; } + if ( check_final_patch_levels(cpu) ) + { + printk(XENLOG_INFO + "microcode: Cannot update microcode patch on the cpu as we hit a final level\n"); + error = -EPERM; + goto out; + } + mc_amd = xmalloc(struct microcode_amd); if ( !mc_amd ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRs2-0001Eh-JZ; Tue, 22 Sep 2015 18:00:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRs1-0001EV-Sm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:49 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 33/73-02324-15791065; Tue, 22 Sep 2015 18:00:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1442944847!21275754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19697 invoked from network); 22 Sep 2015 18:00:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrz-0004Jr-9o for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRry-0008Qi-7n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:47 +0000 Date: Tue, 22 Sep 2015 18:00:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/IO-APIC: don't create pIRQ mapping from masked RTE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d46192366df9951378ddd4457311729cfd0668ca Author: Jan Beulich AuthorDate: Thu Sep 10 15:33:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:33:12 2015 +0200 x86/IO-APIC: don't create pIRQ mapping from masked RTE While moving our XenoLinux patches to 4.2-rc I noticed bogus "already mapped" messages resulting from Linux (legitimately) writing RTEs with only the mask bit set. Clearly we shouldn't even attempt to create a pIRQ <-> IRQ mapping from such RTEs. In the course of this I also found that the respective message isn't really useful without also printing the pre-existing mapping. And I noticed that map_domain_pirq() allowed IRQ0 to get through, despite us never allowing a domain to control that interrupt. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 669d4b85c433674ab3b52ef707af0d3a551c941f master date: 2015-08-25 16:18:31 +0200 --- xen/arch/x86/io_apic.c | 26 +++++++++++++++++--------- xen/arch/x86/irq.c | 7 ++++--- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 4a053a6..4e2e4bf 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2371,9 +2371,14 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) * pirq and irq mapping. Where the GSI is greater than 256, we assume * that dom0 pirq == irq. */ - pirq = (irq >= 256) ? irq : rte.vector; - if ( (pirq < 0) || (pirq >= hardware_domain->nr_pirqs) ) - return -EINVAL; + if ( !rte.mask ) + { + pirq = (irq >= 256) ? irq : rte.vector; + if ( pirq >= hardware_domain->nr_pirqs ) + return -EINVAL; + } + else + pirq = -1; if ( desc->action ) { @@ -2408,12 +2413,15 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) printk(XENLOG_INFO "allocated vector %02x for irq %d\n", ret, irq); } - spin_lock(&hardware_domain->event_lock); - ret = map_domain_pirq(hardware_domain, pirq, irq, - MAP_PIRQ_TYPE_GSI, NULL); - spin_unlock(&hardware_domain->event_lock); - if ( ret < 0 ) - return ret; + if ( pirq >= 0 ) + { + spin_lock(&hardware_domain->event_lock); + ret = map_domain_pirq(hardware_domain, pirq, irq, + MAP_PIRQ_TYPE_GSI, NULL); + spin_unlock(&hardware_domain->event_lock); + if ( ret < 0 ) + return ret; + } spin_lock_irqsave(&ioapic_lock, flags); /* Set the correct irq-handling type. */ diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e7ebeff..91eca4e 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1906,7 +1906,7 @@ int map_domain_pirq( if ( !irq_access_permitted(current->domain, irq)) return -EPERM; - if ( pirq < 0 || pirq >= d->nr_pirqs || irq < 0 || irq >= nr_irqs ) + if ( pirq < 0 || pirq >= d->nr_pirqs || irq <= 0 || irq >= nr_irqs ) { dprintk(XENLOG_G_ERR, "dom%d: invalid pirq %d or irq %d\n", d->domain_id, pirq, irq); @@ -1919,8 +1919,9 @@ int map_domain_pirq( if ( (old_irq > 0 && (old_irq != irq) ) || (old_pirq && (old_pirq != pirq)) ) { - dprintk(XENLOG_G_WARNING, "dom%d: pirq %d or irq %d already mapped\n", - d->domain_id, pirq, irq); + dprintk(XENLOG_G_WARNING, + "dom%d: pirq %d or irq %d already mapped (%d,%d)\n", + d->domain_id, pirq, irq, old_pirq, old_irq); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:00:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:00:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRs2-0001Eh-JZ; Tue, 22 Sep 2015 18:00:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRs1-0001EV-Sm for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:49 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 33/73-02324-15791065; Tue, 22 Sep 2015 18:00:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1442944847!21275754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19697 invoked from network); 22 Sep 2015 18:00:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRrz-0004Jr-9o for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRry-0008Qi-7n for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:47 +0000 Date: Tue, 22 Sep 2015 18:00:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/IO-APIC: don't create pIRQ mapping from masked RTE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d46192366df9951378ddd4457311729cfd0668ca Author: Jan Beulich AuthorDate: Thu Sep 10 15:33:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:33:12 2015 +0200 x86/IO-APIC: don't create pIRQ mapping from masked RTE While moving our XenoLinux patches to 4.2-rc I noticed bogus "already mapped" messages resulting from Linux (legitimately) writing RTEs with only the mask bit set. Clearly we shouldn't even attempt to create a pIRQ <-> IRQ mapping from such RTEs. In the course of this I also found that the respective message isn't really useful without also printing the pre-existing mapping. And I noticed that map_domain_pirq() allowed IRQ0 to get through, despite us never allowing a domain to control that interrupt. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 669d4b85c433674ab3b52ef707af0d3a551c941f master date: 2015-08-25 16:18:31 +0200 --- xen/arch/x86/io_apic.c | 26 +++++++++++++++++--------- xen/arch/x86/irq.c | 7 ++++--- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 4a053a6..4e2e4bf 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2371,9 +2371,14 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) * pirq and irq mapping. Where the GSI is greater than 256, we assume * that dom0 pirq == irq. */ - pirq = (irq >= 256) ? irq : rte.vector; - if ( (pirq < 0) || (pirq >= hardware_domain->nr_pirqs) ) - return -EINVAL; + if ( !rte.mask ) + { + pirq = (irq >= 256) ? irq : rte.vector; + if ( pirq >= hardware_domain->nr_pirqs ) + return -EINVAL; + } + else + pirq = -1; if ( desc->action ) { @@ -2408,12 +2413,15 @@ int ioapic_guest_write(unsigned long physbase, unsigned int reg, u32 val) printk(XENLOG_INFO "allocated vector %02x for irq %d\n", ret, irq); } - spin_lock(&hardware_domain->event_lock); - ret = map_domain_pirq(hardware_domain, pirq, irq, - MAP_PIRQ_TYPE_GSI, NULL); - spin_unlock(&hardware_domain->event_lock); - if ( ret < 0 ) - return ret; + if ( pirq >= 0 ) + { + spin_lock(&hardware_domain->event_lock); + ret = map_domain_pirq(hardware_domain, pirq, irq, + MAP_PIRQ_TYPE_GSI, NULL); + spin_unlock(&hardware_domain->event_lock); + if ( ret < 0 ) + return ret; + } spin_lock_irqsave(&ioapic_lock, flags); /* Set the correct irq-handling type. */ diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index e7ebeff..91eca4e 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1906,7 +1906,7 @@ int map_domain_pirq( if ( !irq_access_permitted(current->domain, irq)) return -EPERM; - if ( pirq < 0 || pirq >= d->nr_pirqs || irq < 0 || irq >= nr_irqs ) + if ( pirq < 0 || pirq >= d->nr_pirqs || irq <= 0 || irq >= nr_irqs ) { dprintk(XENLOG_G_ERR, "dom%d: invalid pirq %d or irq %d\n", d->domain_id, pirq, irq); @@ -1919,8 +1919,9 @@ int map_domain_pirq( if ( (old_irq > 0 && (old_irq != irq) ) || (old_pirq && (old_pirq != pirq)) ) { - dprintk(XENLOG_G_WARNING, "dom%d: pirq %d or irq %d already mapped\n", - d->domain_id, pirq, irq); + dprintk(XENLOG_G_WARNING, + "dom%d: pirq %d or irq %d already mapped (%d,%d)\n", + d->domain_id, pirq, irq, old_pirq, old_irq); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsC-0001Gs-OO; Tue, 22 Sep 2015 18:01:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsB-0001Gc-T0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:59 +0000 Content-Length: 1657 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id EF/A3-02324-B5791065; Tue, 22 Sep 2015 18:00:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1442944857!12646148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27710 invoked from network); 22 Sep 2015 18:00:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRs9-0004Jz-Fo for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRs9-0008RK-Cv for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:57 +0000 Date: Tue, 22 Sep 2015 18:00:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] IOMMU: skip domains without page tables when dumping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8302946796355762657==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8302946796355762657== Content-Length: 1237 Content-Transfer-Encoding: quoted-printable commit 8933ed433693bff92e5f7c760bffcfff6a92614d Author: Jan Beulich AuthorDate: Thu Sep 10 15:33:45 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:33:45 2015 +0200 IOMMU: skip domains without page tables when dumping Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich Tested-by: Roger Pau Monn=C3=A9 master commit: 5f335544cf5b716b0af51223e33373c4a7d65e8c master date: 2015-08-27 17:40:38 +0200 --- xen/drivers/passthrough/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index cc12735..db56aa6 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -368,7 +368,7 @@ static void iommu_dump_p2m_table(unsigned char key) ops =3D iommu_get_ops(); for_each_domain(d) { - if ( is_hardware_domain(d) ) + if ( is_hardware_domain(d) || need_iommu(d) <=3D 0 ) continue; if ( iommu_use_hap_pt(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============8302946796355762657== 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 --===============8302946796355762657==-- From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsC-0001Gs-OO; Tue, 22 Sep 2015 18:01:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsB-0001Gc-T0 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:59 +0000 Content-Length: 1657 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id EF/A3-02324-B5791065; Tue, 22 Sep 2015 18:00:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1442944857!12646148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27710 invoked from network); 22 Sep 2015 18:00:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:00:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRs9-0004Jz-Fo for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRs9-0008RK-Cv for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:00:57 +0000 Date: Tue, 22 Sep 2015 18:00:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] IOMMU: skip domains without page tables when dumping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8302946796355762657==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8302946796355762657== Content-Length: 1237 Content-Transfer-Encoding: quoted-printable commit 8933ed433693bff92e5f7c760bffcfff6a92614d Author: Jan Beulich AuthorDate: Thu Sep 10 15:33:45 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:33:45 2015 +0200 IOMMU: skip domains without page tables when dumping Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich Tested-by: Roger Pau Monn=C3=A9 master commit: 5f335544cf5b716b0af51223e33373c4a7d65e8c master date: 2015-08-27 17:40:38 +0200 --- xen/drivers/passthrough/iommu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index cc12735..db56aa6 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -368,7 +368,7 @@ static void iommu_dump_p2m_table(unsigned char key) ops =3D iommu_get_ops(); for_each_domain(d) { - if ( is_hardware_domain(d) ) + if ( is_hardware_domain(d) || need_iommu(d) <=3D 0 ) continue; if ( iommu_use_hap_pt(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 --===============8302946796355762657== 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 --===============8302946796355762657==-- From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01: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 1ZeRsM-0001I6-R9; Tue, 22 Sep 2015 18:01:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsM-0001Hu-0u for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:10 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 67/01-23203-56791065; Tue, 22 Sep 2015 18:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442944867!15472183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18099 invoked from network); 22 Sep 2015 18:01:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsJ-0004Ka-N8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRsJ-0008Sg-Ii for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:07 +0000 Date: Tue, 22 Sep 2015 18:01:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/NUMA: fix setup_node() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8bdfe147851d7b73f41613966ba6fc8659d6a5b9 Author: Jan Beulich AuthorDate: Thu Sep 10 15:34:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:34:26 2015 +0200 x86/NUMA: fix setup_node() The function referenced an __initdata object (nodes_found). Since this being a node mask was more complicated than needed, the variable gets replaced by a simple counter. Check at once that the count of nodes doesn't go beyond MAX_NUMNODES. Also consolidate three printk()s related to the function's use into just one. Finally (quite the opposite of the above issue) __init-annotate nodes_cover_memory(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 8f945d36d9bddd5b589ba23c7322b30d623dd084 master date: 2015-08-31 13:51:52 +0200 --- xen/arch/x86/srat.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 29fc724..8ebabe2 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -25,7 +25,6 @@ static struct acpi_table_slit *__read_mostly acpi_slit; static nodemask_t memory_nodes_parsed __initdata; static nodemask_t processor_nodes_parsed __initdata; -static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; @@ -45,17 +44,25 @@ int pxm_to_node(int pxm) return (signed char)pxm2node[pxm]; } -__devinit int setup_node(int pxm) +int setup_node(int pxm) { unsigned node = pxm2node[pxm]; - if (node == 0xff) { - if (nodes_weight(nodes_found) >= MAX_NUMNODES) + + if (node == NUMA_NO_NODE) { + static bool_t warned; + static unsigned nodes_found; + + node = nodes_found++; + if (node >= MAX_NUMNODES) { + printk(KERN_WARNING + "SRAT: Too many proximity domains (%#x)\n", + pxm); + warned = 1; return -1; - node = first_unset_node(nodes_found); - node_set(node, nodes_found); + } pxm2node[pxm] = node; } - return pxm2node[pxm]; + return node; } int valid_numa_range(u64 start, u64 end, int node) @@ -176,7 +183,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) pxm = pa->proximity_domain; node = setup_node(pxm); if (node < 0) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -209,7 +215,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) } node = setup_node(pxm); if (node < 0) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -253,7 +258,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) pxm &= 0xff; node = setup_node(pxm); if (node < 0) { - printk(KERN_ERR "SRAT: Too many proximity domains.\n"); bad_srat(); return; } @@ -295,7 +299,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) /* Sanity check to catch more bad SRATs (they are amazingly common). Make sure the PXMs cover all memory. */ -static int nodes_cover_memory(void) +static int __init nodes_cover_memory(void) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01: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 1ZeRsM-0001I6-R9; Tue, 22 Sep 2015 18:01:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsM-0001Hu-0u for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:10 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 67/01-23203-56791065; Tue, 22 Sep 2015 18:01:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1442944867!15472183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18099 invoked from network); 22 Sep 2015 18:01:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsJ-0004Ka-N8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRsJ-0008Sg-Ii for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:07 +0000 Date: Tue, 22 Sep 2015 18:01:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/NUMA: fix setup_node() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8bdfe147851d7b73f41613966ba6fc8659d6a5b9 Author: Jan Beulich AuthorDate: Thu Sep 10 15:34:26 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:34:26 2015 +0200 x86/NUMA: fix setup_node() The function referenced an __initdata object (nodes_found). Since this being a node mask was more complicated than needed, the variable gets replaced by a simple counter. Check at once that the count of nodes doesn't go beyond MAX_NUMNODES. Also consolidate three printk()s related to the function's use into just one. Finally (quite the opposite of the above issue) __init-annotate nodes_cover_memory(). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 8f945d36d9bddd5b589ba23c7322b30d623dd084 master date: 2015-08-31 13:51:52 +0200 --- xen/arch/x86/srat.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 29fc724..8ebabe2 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -25,7 +25,6 @@ static struct acpi_table_slit *__read_mostly acpi_slit; static nodemask_t memory_nodes_parsed __initdata; static nodemask_t processor_nodes_parsed __initdata; -static nodemask_t nodes_found __initdata; static struct node nodes[MAX_NUMNODES] __initdata; static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; @@ -45,17 +44,25 @@ int pxm_to_node(int pxm) return (signed char)pxm2node[pxm]; } -__devinit int setup_node(int pxm) +int setup_node(int pxm) { unsigned node = pxm2node[pxm]; - if (node == 0xff) { - if (nodes_weight(nodes_found) >= MAX_NUMNODES) + + if (node == NUMA_NO_NODE) { + static bool_t warned; + static unsigned nodes_found; + + node = nodes_found++; + if (node >= MAX_NUMNODES) { + printk(KERN_WARNING + "SRAT: Too many proximity domains (%#x)\n", + pxm); + warned = 1; return -1; - node = first_unset_node(nodes_found); - node_set(node, nodes_found); + } pxm2node[pxm] = node; } - return pxm2node[pxm]; + return node; } int valid_numa_range(u64 start, u64 end, int node) @@ -176,7 +183,6 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) pxm = pa->proximity_domain; node = setup_node(pxm); if (node < 0) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -209,7 +215,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) } node = setup_node(pxm); if (node < 0) { - printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm); bad_srat(); return; } @@ -253,7 +258,6 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) pxm &= 0xff; node = setup_node(pxm); if (node < 0) { - printk(KERN_ERR "SRAT: Too many proximity domains.\n"); bad_srat(); return; } @@ -295,7 +299,7 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) /* Sanity check to catch more bad SRATs (they are amazingly common). Make sure the PXMs cover all memory. */ -static int nodes_cover_memory(void) +static int __init nodes_cover_memory(void) { int i; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01: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 1ZeRsX-0001K5-Tq; Tue, 22 Sep 2015 18:01:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsW-0001Jc-BN for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:20 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 72/24-02324-F6791065; Tue, 22 Sep 2015 18:01:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442944878!36985503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12379 invoked from network); 22 Sep 2015 18:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsT-0004Kf-US for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRsT-0008TE-Qp for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:17 +0000 Date: Tue, 22 Sep 2015 18:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/NUMA: don't account hotplug 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 ef372ac6ec1619491bb194c841d1b7405554a1c9 Author: Jan Beulich AuthorDate: Thu Sep 10 15:35:11 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:35:11 2015 +0200 x86/NUMA: don't account hotplug regions ... except in cases where they really matter: node_memblk_range[] now is the only place all regions get stored. nodes[] and NODE_DATA() track present memory only. This improves the reporting when nodes have disjoint "normal" and hotplug regions, with the hotplug region sitting above the highest populated page. In such cases a node's spanned-pages value (visible in both XEN_SYSCTL_numainfo and 'u' debug key output) covered all the way up to top of populated memory, giving quite different a picture from what an otherwise identically configured system without and hotplug regions would report. Note, however, that the actual hotplug case (as well as cases of nodes with multiple disjoint present regions) is still not being handled such that the reported values would represent how much memory a node really has (but that can be considered intentional). Reported-by: Jim Fehlig This at once makes nodes_cover_memory() no longer consider E820_RAM regions covered by SRAT hotplug regions. Also reject self-overlaps with mismatching hotplug flags. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Jim Fehlig master commit: c011f470e6e79208f5baa071b4d072b78c88e2ba master date: 2015-08-31 13:52:24 +0200 --- xen/arch/x86/srat.c | 56 +++++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 8ebabe2..12bb008 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -32,7 +32,7 @@ static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static int memblk_nodeid[NR_NODE_MEMBLKS]; - +static __initdata DECLARE_BITMAP(memblk_hotplug, NR_NODE_MEMBLKS); static int node_to_pxm(int n); @@ -89,9 +89,9 @@ static __init int conflicting_memblks(u64 start, u64 end) if (nd->start == nd->end) continue; if (nd->end > start && nd->start < end) - return memblk_nodeid[i]; + return i; if (nd->end == end && nd->start == start) - return memblk_nodeid[i]; + return i; } return -1; } @@ -229,7 +229,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) void __init acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { - struct node *nd; u64 start, end; int node, pxm; int i; @@ -263,30 +262,40 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) } /* It is fine to add this area to the nodes data it will be used later*/ i = conflicting_memblks(start, end); - if (i == node) { - printk(KERN_WARNING - "SRAT: Warning: PXM %d (%"PRIx64"-%"PRIx64") overlaps with itself (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, nodes[i].start, nodes[i].end); - } else if (i >= 0) { + if (i < 0) + /* everything fine */; + else if (memblk_nodeid[i] == node) { + bool_t mismatch = !(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) != + !test_bit(i, memblk_hotplug); + + printk("%sSRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with itself (%"PRIx64"-%"PRIx64")\n", + mismatch ? KERN_ERR : KERN_WARNING, pxm, start, end, + node_memblk_range[i].start, node_memblk_range[i].end); + if (mismatch) { + bad_srat(); + return; + } + } else { printk(KERN_ERR - "SRAT: PXM %d (%"PRIx64"-%"PRIx64") overlaps with PXM %d (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, node_to_pxm(i), - nodes[i].start, nodes[i].end); + "SRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with PXM %u (%"PRIx64"-%"PRIx64")\n", + pxm, start, end, node_to_pxm(memblk_nodeid[i]), + node_memblk_range[i].start, node_memblk_range[i].end); bad_srat(); return; } - nd = &nodes[node]; - if (!node_test_and_set(node, memory_nodes_parsed)) { - nd->start = start; - nd->end = end; - } else { - if (start < nd->start) + if (!(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)) { + struct node *nd = &nodes[node]; + + if (!node_test_and_set(node, memory_nodes_parsed)) { nd->start = start; - if (nd->end < end) nd->end = end; + } else { + if (start < nd->start) + nd->start = start; + if (nd->end < end) + nd->end = end; + } } - if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && end > mem_hotplug) - mem_hotplug = end; printk(KERN_INFO "SRAT: Node %u PXM %u %"PRIx64"-%"PRIx64"%s\n", node, pxm, start, end, ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE ? " (hotplug)" : ""); @@ -294,6 +303,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) node_memblk_range[num_node_memblks].start = start; node_memblk_range[num_node_memblks].end = end; memblk_nodeid[num_node_memblks] = node; + if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) { + __set_bit(num_node_memblks, memblk_hotplug); + if (end > mem_hotplug) + mem_hotplug = end; + } num_node_memblks++; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01: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 1ZeRsX-0001K5-Tq; Tue, 22 Sep 2015 18:01:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsW-0001Jc-BN for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:20 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 72/24-02324-F6791065; Tue, 22 Sep 2015 18:01:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1442944878!36985503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12379 invoked from network); 22 Sep 2015 18:01:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsT-0004Kf-US for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRsT-0008TE-Qp for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:17 +0000 Date: Tue, 22 Sep 2015 18:01:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/NUMA: don't account hotplug 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 ef372ac6ec1619491bb194c841d1b7405554a1c9 Author: Jan Beulich AuthorDate: Thu Sep 10 15:35:11 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:35:11 2015 +0200 x86/NUMA: don't account hotplug regions ... except in cases where they really matter: node_memblk_range[] now is the only place all regions get stored. nodes[] and NODE_DATA() track present memory only. This improves the reporting when nodes have disjoint "normal" and hotplug regions, with the hotplug region sitting above the highest populated page. In such cases a node's spanned-pages value (visible in both XEN_SYSCTL_numainfo and 'u' debug key output) covered all the way up to top of populated memory, giving quite different a picture from what an otherwise identically configured system without and hotplug regions would report. Note, however, that the actual hotplug case (as well as cases of nodes with multiple disjoint present regions) is still not being handled such that the reported values would represent how much memory a node really has (but that can be considered intentional). Reported-by: Jim Fehlig This at once makes nodes_cover_memory() no longer consider E820_RAM regions covered by SRAT hotplug regions. Also reject self-overlaps with mismatching hotplug flags. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Jim Fehlig master commit: c011f470e6e79208f5baa071b4d072b78c88e2ba master date: 2015-08-31 13:52:24 +0200 --- xen/arch/x86/srat.c | 56 +++++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 8ebabe2..12bb008 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -32,7 +32,7 @@ static u8 __read_mostly pxm2node[256] = { [0 ... 255] = NUMA_NO_NODE }; static int num_node_memblks; static struct node node_memblk_range[NR_NODE_MEMBLKS]; static int memblk_nodeid[NR_NODE_MEMBLKS]; - +static __initdata DECLARE_BITMAP(memblk_hotplug, NR_NODE_MEMBLKS); static int node_to_pxm(int n); @@ -89,9 +89,9 @@ static __init int conflicting_memblks(u64 start, u64 end) if (nd->start == nd->end) continue; if (nd->end > start && nd->start < end) - return memblk_nodeid[i]; + return i; if (nd->end == end && nd->start == start) - return memblk_nodeid[i]; + return i; } return -1; } @@ -229,7 +229,6 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) void __init acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) { - struct node *nd; u64 start, end; int node, pxm; int i; @@ -263,30 +262,40 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) } /* It is fine to add this area to the nodes data it will be used later*/ i = conflicting_memblks(start, end); - if (i == node) { - printk(KERN_WARNING - "SRAT: Warning: PXM %d (%"PRIx64"-%"PRIx64") overlaps with itself (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, nodes[i].start, nodes[i].end); - } else if (i >= 0) { + if (i < 0) + /* everything fine */; + else if (memblk_nodeid[i] == node) { + bool_t mismatch = !(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) != + !test_bit(i, memblk_hotplug); + + printk("%sSRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with itself (%"PRIx64"-%"PRIx64")\n", + mismatch ? KERN_ERR : KERN_WARNING, pxm, start, end, + node_memblk_range[i].start, node_memblk_range[i].end); + if (mismatch) { + bad_srat(); + return; + } + } else { printk(KERN_ERR - "SRAT: PXM %d (%"PRIx64"-%"PRIx64") overlaps with PXM %d (%" - PRIx64"-%"PRIx64")\n", pxm, start, end, node_to_pxm(i), - nodes[i].start, nodes[i].end); + "SRAT: PXM %u (%"PRIx64"-%"PRIx64") overlaps with PXM %u (%"PRIx64"-%"PRIx64")\n", + pxm, start, end, node_to_pxm(memblk_nodeid[i]), + node_memblk_range[i].start, node_memblk_range[i].end); bad_srat(); return; } - nd = &nodes[node]; - if (!node_test_and_set(node, memory_nodes_parsed)) { - nd->start = start; - nd->end = end; - } else { - if (start < nd->start) + if (!(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)) { + struct node *nd = &nodes[node]; + + if (!node_test_and_set(node, memory_nodes_parsed)) { nd->start = start; - if (nd->end < end) nd->end = end; + } else { + if (start < nd->start) + nd->start = start; + if (nd->end < end) + nd->end = end; + } } - if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && end > mem_hotplug) - mem_hotplug = end; printk(KERN_INFO "SRAT: Node %u PXM %u %"PRIx64"-%"PRIx64"%s\n", node, pxm, start, end, ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE ? " (hotplug)" : ""); @@ -294,6 +303,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) node_memblk_range[num_node_memblks].start = start; node_memblk_range[num_node_memblks].end = end; memblk_nodeid[num_node_memblks] = node; + if (ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) { + __set_bit(num_node_memblks, memblk_hotplug); + if (end > mem_hotplug) + mem_hotplug = end; + } num_node_memblks++; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01: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 1ZeRsj-0001MG-0B; Tue, 22 Sep 2015 18:01:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsh-0001Lx-9J for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:31 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id BD/F4-12946-A7791065; Tue, 22 Sep 2015 18:01:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442944888!46719624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25347 invoked from network); 22 Sep 2015 18:01:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRse-0004Kp-5f for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRse-0008U1-2F for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:28 +0000 Date: Tue, 22 Sep 2015 18:01:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/NUMA: make init_node_heap() respect Xen heap limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b6e02bd3b589c50d3d8111e91b9510d226e7e40 Author: Jan Beulich AuthorDate: Thu Sep 10 15:36:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:36:12 2015 +0200 x86/NUMA: make init_node_heap() respect Xen heap limit On NUMA systems, where we try to use node local memory for the basic control structures of the buddy allocator, this special case needs to take into consideration a possible address width limit placed on the Xen heap. In turn this (but also other, more abstract considerations) requires that xenheap_max_mfn() not be called more than once (at most we might permit it to be called a second time with a larger value than was passed the first time), and be called only before calling end_boot_allocator(). While inspecting all the involved code, a couple of off-by-one issues were found (and are being corrected here at once): - arch_init_memory() cleared one too many page table slots - the highmem_start based invocation of xenheap_max_mfn() passed too big a value - xenheap_max_mfn() calculated the wrong bit count in edge cases Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell xen/arm64: do not (incorrectly) limit size of xenheap The commit 88e3ed61642bb393458acc7a9bd2f96edc337190 "x86/NUMA: make init_node_heap() respect Xen heap limit" breaks boot on the arm64 board X-Gene. The xenheap bits variable is used to know the last RAM MFN always mapped in Xen virtual memory. If the value is 0, it means that all the memory is always mapped in Xen virtual memory. On X-gene the RAM bank resides above 128GB and last xenheap MFN is 0x4400000. With the new way to calculate the number of bits, xenheap_bits will be equal to 38 bits. This will result to hide all the RAM and the impossibility to allocate xenheap memory. Given that aarch64 have always all the memory mapped in Xen virtual memory, it's not necessary to call xenheap_max_mfn which set the number of bits. Suggested-by: Jan Beulich Signed-off-by: Julien Grall Acked-by: Ian Campbell master commit: 88e3ed61642bb393458acc7a9bd2f96edc337190 master date: 2015-09-01 14:02:57 +0200 master commit: 0a7167d9b20cdc48e6ea320fbbb920b3267c9757 master date: 2015-09-04 14:58:07 +0100 --- xen/arch/arm/setup.c | 1 - xen/arch/x86/mm.c | 2 +- xen/arch/x86/setup.c | 11 +++++++---- xen/common/page_alloc.c | 24 ++++++++++++++++++------ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 1e488ee..3d212f4 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -664,7 +664,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; xenheap_mfn_start = ram_start >> PAGE_SHIFT; xenheap_mfn_end = ram_end >> PAGE_SHIFT; - xenheap_max_mfn(xenheap_mfn_end); /* * Need enough mapped pages for copying the DTB. diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 59e16a6..7ebd733 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -372,7 +372,7 @@ void __init arch_init_memory(void) for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; - for ( ; i <= L3_PAGETABLE_ENTRIES; ++i ) + for ( ; i < L3_PAGETABLE_ENTRIES; ++i ) l3tab[i] = l3e_empty(); split_l4e = l4e_from_pfn(virt_to_mfn(l3tab), __PAGE_HYPERVISOR); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index fefa0b7..1efe02f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -970,7 +970,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) setup_max_pdx(raw_max_page); if ( highmem_start ) - xenheap_max_mfn(PFN_DOWN(highmem_start)); + xenheap_max_mfn(PFN_DOWN(highmem_start - 1)); /* * Walk every RAM region and map it in its entirety (on x86/64, at least) @@ -1151,9 +1151,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) numa_initmem_init(0, raw_max_page); - end_boot_allocator(); - system_state = SYS_STATE_boot; - if ( max_page - 1 > virt_to_mfn(HYPERVISOR_VIRT_END - 1) ) { unsigned long limit = virt_to_mfn(HYPERVISOR_VIRT_END - 1); @@ -1162,6 +1159,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( !highmem_start ) xenheap_max_mfn(limit); + end_boot_allocator(); + /* Pass the remaining memory to the allocator. */ for ( i = 0; i < boot_e820.nr_map; i++ ) { @@ -1185,6 +1184,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) opt_tmem = 0; } } + else + end_boot_allocator(); + + system_state = SYS_STATE_boot; vm_init(); console_init_ring(); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 24a759c..fc6db33 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -405,13 +405,19 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) spin_unlock(&heap_lock); } +static bool_t __read_mostly first_node_initialised; +#ifndef CONFIG_SEPARATE_XENHEAP +static unsigned int __read_mostly xenheap_bits; +#else +#define xenheap_bits 0 +#endif + static unsigned long init_node_heap(int node, unsigned long mfn, unsigned long nr, bool_t *use_tail) { /* First node to be discovered has its heap metadata statically alloced. */ static heap_by_zone_and_order_t _heap_static; static unsigned long avail_static[NR_ZONES]; - static int first_node_initialised; unsigned long needed = (sizeof(**_heap) + sizeof(**avail) * NR_ZONES + PAGE_SIZE - 1) >> PAGE_SHIFT; @@ -429,14 +435,18 @@ static unsigned long init_node_heap(int node, unsigned long mfn, } #ifdef DIRECTMAP_VIRT_END else if ( *use_tail && nr >= needed && - (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + nr - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn + nr - needed); avail[node] = mfn_to_virt(mfn + nr - 1) + PAGE_SIZE - sizeof(**avail) * NR_ZONES; } else if ( nr >= needed && - (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + needed - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn); avail[node] = mfn_to_virt(mfn + needed - 1) + @@ -1541,11 +1551,13 @@ void free_xenheap_pages(void *v, unsigned int order) #else -static unsigned int __read_mostly xenheap_bits; - void __init xenheap_max_mfn(unsigned long mfn) { - xenheap_bits = fls(mfn) + PAGE_SHIFT; + ASSERT(!first_node_initialised); + ASSERT(!xenheap_bits); + BUILD_BUG_ON(PADDR_BITS >= BITS_PER_LONG); + xenheap_bits = min(fls(mfn + 1) - 1 + PAGE_SHIFT, PADDR_BITS); + printk(XENLOG_INFO "Xen heap: %u bits\n", xenheap_bits); } void init_xenheap_pages(paddr_t ps, paddr_t pe) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01: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 1ZeRsj-0001MG-0B; Tue, 22 Sep 2015 18:01:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsh-0001Lx-9J for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:31 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id BD/F4-12946-A7791065; Tue, 22 Sep 2015 18:01:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1442944888!46719624!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25347 invoked from network); 22 Sep 2015 18:01:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRse-0004Kp-5f for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRse-0008U1-2F for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:28 +0000 Date: Tue, 22 Sep 2015 18:01:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/NUMA: make init_node_heap() respect Xen heap limit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b6e02bd3b589c50d3d8111e91b9510d226e7e40 Author: Jan Beulich AuthorDate: Thu Sep 10 15:36:12 2015 +0200 Commit: Jan Beulich CommitDate: Thu Sep 10 15:36:12 2015 +0200 x86/NUMA: make init_node_heap() respect Xen heap limit On NUMA systems, where we try to use node local memory for the basic control structures of the buddy allocator, this special case needs to take into consideration a possible address width limit placed on the Xen heap. In turn this (but also other, more abstract considerations) requires that xenheap_max_mfn() not be called more than once (at most we might permit it to be called a second time with a larger value than was passed the first time), and be called only before calling end_boot_allocator(). While inspecting all the involved code, a couple of off-by-one issues were found (and are being corrected here at once): - arch_init_memory() cleared one too many page table slots - the highmem_start based invocation of xenheap_max_mfn() passed too big a value - xenheap_max_mfn() calculated the wrong bit count in edge cases Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell xen/arm64: do not (incorrectly) limit size of xenheap The commit 88e3ed61642bb393458acc7a9bd2f96edc337190 "x86/NUMA: make init_node_heap() respect Xen heap limit" breaks boot on the arm64 board X-Gene. The xenheap bits variable is used to know the last RAM MFN always mapped in Xen virtual memory. If the value is 0, it means that all the memory is always mapped in Xen virtual memory. On X-gene the RAM bank resides above 128GB and last xenheap MFN is 0x4400000. With the new way to calculate the number of bits, xenheap_bits will be equal to 38 bits. This will result to hide all the RAM and the impossibility to allocate xenheap memory. Given that aarch64 have always all the memory mapped in Xen virtual memory, it's not necessary to call xenheap_max_mfn which set the number of bits. Suggested-by: Jan Beulich Signed-off-by: Julien Grall Acked-by: Ian Campbell master commit: 88e3ed61642bb393458acc7a9bd2f96edc337190 master date: 2015-09-01 14:02:57 +0200 master commit: 0a7167d9b20cdc48e6ea320fbbb920b3267c9757 master date: 2015-09-04 14:58:07 +0100 --- xen/arch/arm/setup.c | 1 - xen/arch/x86/mm.c | 2 +- xen/arch/x86/setup.c | 11 +++++++---- xen/common/page_alloc.c | 24 ++++++++++++++++++------ 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 1e488ee..3d212f4 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -664,7 +664,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; xenheap_mfn_start = ram_start >> PAGE_SHIFT; xenheap_mfn_end = ram_end >> PAGE_SHIFT; - xenheap_max_mfn(xenheap_mfn_end); /* * Need enough mapped pages for copying the DTB. diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 59e16a6..7ebd733 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -372,7 +372,7 @@ void __init arch_init_memory(void) for ( i = 0; i < l3_table_offset(split_va); ++i ) l3tab[i] = l3idle[i]; - for ( ; i <= L3_PAGETABLE_ENTRIES; ++i ) + for ( ; i < L3_PAGETABLE_ENTRIES; ++i ) l3tab[i] = l3e_empty(); split_l4e = l4e_from_pfn(virt_to_mfn(l3tab), __PAGE_HYPERVISOR); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index fefa0b7..1efe02f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -970,7 +970,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) setup_max_pdx(raw_max_page); if ( highmem_start ) - xenheap_max_mfn(PFN_DOWN(highmem_start)); + xenheap_max_mfn(PFN_DOWN(highmem_start - 1)); /* * Walk every RAM region and map it in its entirety (on x86/64, at least) @@ -1151,9 +1151,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) numa_initmem_init(0, raw_max_page); - end_boot_allocator(); - system_state = SYS_STATE_boot; - if ( max_page - 1 > virt_to_mfn(HYPERVISOR_VIRT_END - 1) ) { unsigned long limit = virt_to_mfn(HYPERVISOR_VIRT_END - 1); @@ -1162,6 +1159,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) if ( !highmem_start ) xenheap_max_mfn(limit); + end_boot_allocator(); + /* Pass the remaining memory to the allocator. */ for ( i = 0; i < boot_e820.nr_map; i++ ) { @@ -1185,6 +1184,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) opt_tmem = 0; } } + else + end_boot_allocator(); + + system_state = SYS_STATE_boot; vm_init(); console_init_ring(); diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 24a759c..fc6db33 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -405,13 +405,19 @@ void get_outstanding_claims(uint64_t *free_pages, uint64_t *outstanding_pages) spin_unlock(&heap_lock); } +static bool_t __read_mostly first_node_initialised; +#ifndef CONFIG_SEPARATE_XENHEAP +static unsigned int __read_mostly xenheap_bits; +#else +#define xenheap_bits 0 +#endif + static unsigned long init_node_heap(int node, unsigned long mfn, unsigned long nr, bool_t *use_tail) { /* First node to be discovered has its heap metadata statically alloced. */ static heap_by_zone_and_order_t _heap_static; static unsigned long avail_static[NR_ZONES]; - static int first_node_initialised; unsigned long needed = (sizeof(**_heap) + sizeof(**avail) * NR_ZONES + PAGE_SIZE - 1) >> PAGE_SHIFT; @@ -429,14 +435,18 @@ static unsigned long init_node_heap(int node, unsigned long mfn, } #ifdef DIRECTMAP_VIRT_END else if ( *use_tail && nr >= needed && - (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + nr) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + nr - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn + nr - needed); avail[node] = mfn_to_virt(mfn + nr - 1) + PAGE_SIZE - sizeof(**avail) * NR_ZONES; } else if ( nr >= needed && - (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) ) + (mfn + needed) <= (virt_to_mfn(eva - 1) + 1) && + (!xenheap_bits || + !((mfn + needed - 1) >> (xenheap_bits - PAGE_SHIFT))) ) { _heap[node] = mfn_to_virt(mfn); avail[node] = mfn_to_virt(mfn + needed - 1) + @@ -1541,11 +1551,13 @@ void free_xenheap_pages(void *v, unsigned int order) #else -static unsigned int __read_mostly xenheap_bits; - void __init xenheap_max_mfn(unsigned long mfn) { - xenheap_bits = fls(mfn) + PAGE_SHIFT; + ASSERT(!first_node_initialised); + ASSERT(!xenheap_bits); + BUILD_BUG_ON(PADDR_BITS >= BITS_PER_LONG); + xenheap_bits = min(fls(mfn + 1) - 1 + PAGE_SHIFT, PADDR_BITS); + printk(XENLOG_INFO "Xen heap: %u bits\n", xenheap_bits); } void init_xenheap_pages(paddr_t ps, paddr_t pe) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRss-0001OF-2t; Tue, 22 Sep 2015 18:01:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsq-0001Nr-Mq for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:40 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id B0/75-03763-48791065; Tue, 22 Sep 2015 18:01:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1442944898!46652832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9048 invoked from network); 22 Sep 2015 18:01:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRso-0004Ky-AY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRso-0008UQ-9K for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:38 +0000 Date: Tue, 22 Sep 2015 18:01:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2049db36021e305510adc09c8388208c784c7522 Author: Ian Jackson AuthorDate: Fri Sep 11 11:51:59 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:51:59 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 9936090..ea44f65 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 327319a1e9bb79996e8de4df78ccde25e87692e2 -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TRADITIONAL_REVISION ?= dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0 +# Mon Jun 30 10:07:54 2014 +0200 +# vnc: limit client_cut_text msg payload size # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRss-0001OF-2t; Tue, 22 Sep 2015 18:01:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsq-0001Nr-Mq for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:40 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id B0/75-03763-48791065; Tue, 22 Sep 2015 18:01:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1442944898!46652832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9048 invoked from network); 22 Sep 2015 18:01:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRso-0004Ky-AY for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRso-0008UQ-9K for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:38 +0000 Date: Tue, 22 Sep 2015 18:01:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2049db36021e305510adc09c8388208c784c7522 Author: Ian Jackson AuthorDate: Fri Sep 11 11:51:59 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:51:59 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 9936090..ea44f65 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 327319a1e9bb79996e8de4df78ccde25e87692e2 -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TRADITIONAL_REVISION ?= dfe880e8d5fdc863ce6bbcdcaebaf918f8689cc0 +# Mon Jun 30 10:07:54 2014 +0200 +# vnc: limit client_cut_text msg payload size # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRt2-0001QO-5L; Tue, 22 Sep 2015 18:01:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRt0-0001Q4-S2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:50 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 20/82-19220-E8791065; Tue, 22 Sep 2015 18:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1442944908!37002076!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3237 invoked from network); 22 Sep 2015 18:01:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsy-0004L6-GN for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRsy-0008Um-F8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:48 +0000 Date: Tue, 22 Sep 2015 18:01:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xl: correct handling of extra_config in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffb4e6387f489b6b5ce287f51db43cb37ebae064 Author: Wei Liu AuthorDate: Tue Jul 14 17:41:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:53:14 2015 +0100 xl: correct handling of extra_config in main_cpupoolcreate Don't dereference extra_config if it's NULL. Don't leak extra_config in the end. Also fixed a typo in error string while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 705c9e12426cba82804cb578fc70785281655d94) --- tools/libxl/xl_cmdimpl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4a8af47..173e773 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7099,9 +7099,9 @@ int main_cpupoolcreate(int argc, char **argv) else config_src="command line"; - if (strlen(extra_config)) { + if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { - fprintf(stderr, "Failed to attach extra configration\n"); + fprintf(stderr, "Failed to attach extra configuration\n"); goto out; } config_data = xrealloc(config_data, @@ -7225,6 +7225,7 @@ out_cfg: out: free(name); free(config_data); + free(extra_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:01:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:01:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRt2-0001QO-5L; Tue, 22 Sep 2015 18:01:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRt0-0001Q4-S2 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:50 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 20/82-19220-E8791065; Tue, 22 Sep 2015 18:01:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1442944908!37002076!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3237 invoked from network); 22 Sep 2015 18:01:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:01:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRsy-0004L6-GN for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRsy-0008Um-F8 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:48 +0000 Date: Tue, 22 Sep 2015 18:01:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] xl: correct handling of extra_config in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffb4e6387f489b6b5ce287f51db43cb37ebae064 Author: Wei Liu AuthorDate: Tue Jul 14 17:41:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:53:14 2015 +0100 xl: correct handling of extra_config in main_cpupoolcreate Don't dereference extra_config if it's NULL. Don't leak extra_config in the end. Also fixed a typo in error string while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 705c9e12426cba82804cb578fc70785281655d94) --- tools/libxl/xl_cmdimpl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 4a8af47..173e773 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7099,9 +7099,9 @@ int main_cpupoolcreate(int argc, char **argv) else config_src="command line"; - if (strlen(extra_config)) { + if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { - fprintf(stderr, "Failed to attach extra configration\n"); + fprintf(stderr, "Failed to attach extra configuration\n"); goto out; } config_data = xrealloc(config_data, @@ -7225,6 +7225,7 @@ out_cfg: out: free(name); free(config_data); + free(extra_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:02:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:02: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 1ZeRtH-0001TF-AE; Tue, 22 Sep 2015 18:02:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRtG-0001T0-93 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:02:06 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id AB/FC-28221-D9791065; Tue, 22 Sep 2015 18:02:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1442944923!52016004!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29625 invoked from network); 22 Sep 2015 18:02:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:02:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRtD-0004LE-LM for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:02:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRt8-0008V8-Jp for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:58 +0000 Date: Tue, 22 Sep 2015 18:01:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Increase device model startup timeout to 1min. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbbd29a25d090f1180d14210358c6d7ccdebef85 Author: Anthony PERARD AuthorDate: Tue Jul 7 16:09:13 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 18 16:29:08 2015 +0100 libxl: Increase device model startup timeout to 1min. On a busy host, QEMU may take more than 10s to load and start. This is likely due to a bug in Linux where the I/O subsystem sometime produce high latency under load and result in QEMU taking a long time to load every single dynamic libraries. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson (cherry picked from commit 9acfbe14d7261b03e3b3f4dc3c850ba2a7093e1f) Conflicts: tools/libxl/libxl_internal.h --- tools/libxl/libxl_internal.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bb2ebc0..ff88f3d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -85,7 +85,9 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_HOTPLUG_TIMEOUT 10 -#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +/* QEMU may be slow to load and start due to a bug in Linux where the I/O + * subsystem sometime produce high latency under load. */ +#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 22 18:02:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 22 Sep 2015 18:02: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 1ZeRtH-0001TF-AE; Tue, 22 Sep 2015 18:02:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRtG-0001T0-93 for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:02:06 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id AB/FC-28221-D9791065; Tue, 22 Sep 2015 18:02:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1442944923!52016004!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29625 invoked from network); 22 Sep 2015 18:02:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 22 Sep 2015 18:02:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZeRtD-0004LE-LM for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:02:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZeRt8-0008V8-Jp for xen-changelog@lists.xensource.com; Tue, 22 Sep 2015 18:01:58 +0000 Date: Tue, 22 Sep 2015 18:01:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Increase device model startup timeout to 1min. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bbbd29a25d090f1180d14210358c6d7ccdebef85 Author: Anthony PERARD AuthorDate: Tue Jul 7 16:09:13 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 18 16:29:08 2015 +0100 libxl: Increase device model startup timeout to 1min. On a busy host, QEMU may take more than 10s to load and start. This is likely due to a bug in Linux where the I/O subsystem sometime produce high latency under load and result in QEMU taking a long time to load every single dynamic libraries. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson (cherry picked from commit 9acfbe14d7261b03e3b3f4dc3c850ba2a7093e1f) Conflicts: tools/libxl/libxl_internal.h --- tools/libxl/libxl_internal.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bb2ebc0..ff88f3d 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -85,7 +85,9 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_HOTPLUG_TIMEOUT 10 -#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +/* QEMU may be slow to load and start due to a bug in Linux where the I/O + * subsystem sometime produce high latency under load. */ +#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21: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 1ZfxGL-0006BH-NI; Sat, 26 Sep 2015 21: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 1ZfxGK-0006BC-KZ for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:08 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id C1/EA-12946-7A117065; Sat, 26 Sep 2015 21:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1443303846!10992126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4527 invoked from network); 26 Sep 2015 21:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGG-0003D1-Hr for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGF-000205-LU for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:03 +0000 Date: Sat, 26 Sep 2015 21:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Template for feature documents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d02bed2a3926ca65f6d49eeb034eab00c532d22b Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:26 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:27:42 2015 +0100 docs: Template for feature documents Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- docs/Makefile | 2 +- docs/features/template.pandoc | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index d25e6c7..b9da605 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,7 +15,7 @@ MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) +PANDOCSRC-y := $(sort $(shell find features/ misc/ specs/ -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) diff --git a/docs/features/template.pandoc b/docs/features/template.pandoc new file mode 100644 index 0000000..7698291 --- /dev/null +++ b/docs/features/template.pandoc @@ -0,0 +1,75 @@ +% Template for feature documents +% Revision $N + +\clearpage + +This is a suggested template for formatting of a Xen feature document in +tree. + +The purpose of this document is to provide a concrete support statement +for the feature (indicating its security status), as well as brief user +and technical documentation. + +# Basics + +A table with an overview of the support status and applicability. + +---------------- ---------------------------------------------------- + Status: e.g. **Supported**/**Tech Preview**/**Experimental** + +Architecture(s): e.g. x86, arm + + Component(s): e.g. Hypervisor, toolstack, guest + + Hardware: _where applicable_ +---------------- ---------------------------------------------------- + +# Overview + +A short description the feature, similar to an abstract for a +paper/presentation. + +# User information + +Information for a user attempting to use the feature. Should include +how to enable the feature (is it enabled by default? If not, how to turn +it on?), and how to interact with the feature (typically via `xl`). + +# Limitations + +Information concerning incompatibilities with other features or hardware +combinations. + +# Technical information + +Information for a developer or power user. Should include where to look +in-tree for detailed documents and code. + +# Testing + +Information concerning how to properly test changes affecting this feature. + +# Areas for improvement + +List of enhancements which could be undertaken, e.g. to improve the +feature itself, or improve interaction with other features. + +# Known issues + +List of known issues or bugs. For tech preview or experimental +features, this section must contain the list of items needing fixing for +its status to be upgraded. + +# References + +Relevant external references for this feature. + +# History + +A table of changes to the document, in chronological order. + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +YYYY-MM-DD N Xen X.Y ... +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21: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 1ZfxGL-0006BH-NI; Sat, 26 Sep 2015 21: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 1ZfxGK-0006BC-KZ for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:08 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id C1/EA-12946-7A117065; Sat, 26 Sep 2015 21:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1443303846!10992126!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4527 invoked from network); 26 Sep 2015 21:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGG-0003D1-Hr for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGF-000205-LU for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:03 +0000 Date: Sat, 26 Sep 2015 21:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Template for feature documents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d02bed2a3926ca65f6d49eeb034eab00c532d22b Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:26 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:27:42 2015 +0100 docs: Template for feature documents Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- docs/Makefile | 2 +- docs/features/template.pandoc | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index d25e6c7..b9da605 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,7 +15,7 @@ MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) +PANDOCSRC-y := $(sort $(shell find features/ misc/ specs/ -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) diff --git a/docs/features/template.pandoc b/docs/features/template.pandoc new file mode 100644 index 0000000..7698291 --- /dev/null +++ b/docs/features/template.pandoc @@ -0,0 +1,75 @@ +% Template for feature documents +% Revision $N + +\clearpage + +This is a suggested template for formatting of a Xen feature document in +tree. + +The purpose of this document is to provide a concrete support statement +for the feature (indicating its security status), as well as brief user +and technical documentation. + +# Basics + +A table with an overview of the support status and applicability. + +---------------- ---------------------------------------------------- + Status: e.g. **Supported**/**Tech Preview**/**Experimental** + +Architecture(s): e.g. x86, arm + + Component(s): e.g. Hypervisor, toolstack, guest + + Hardware: _where applicable_ +---------------- ---------------------------------------------------- + +# Overview + +A short description the feature, similar to an abstract for a +paper/presentation. + +# User information + +Information for a user attempting to use the feature. Should include +how to enable the feature (is it enabled by default? If not, how to turn +it on?), and how to interact with the feature (typically via `xl`). + +# Limitations + +Information concerning incompatibilities with other features or hardware +combinations. + +# Technical information + +Information for a developer or power user. Should include where to look +in-tree for detailed documents and code. + +# Testing + +Information concerning how to properly test changes affecting this feature. + +# Areas for improvement + +List of enhancements which could be undertaken, e.g. to improve the +feature itself, or improve interaction with other features. + +# Known issues + +List of known issues or bugs. For tech preview or experimental +features, this section must contain the list of items needing fixing for +its status to be upgraded. + +# References + +Relevant external references for this feature. + +# History + +A table of changes to the document, in chronological order. + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +YYYY-MM-DD N Xen X.Y ... +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGX-0006Br-Pq; Sat, 26 Sep 2015 21:44:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGV-0006Be-RK for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:20 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id A3/EF-31450-3B117065; Sat, 26 Sep 2015 21:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1443303857!37966262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 342 invoked from network); 26 Sep 2015 21:44:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGS-0003D5-VS for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGS-00020V-1T for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:16 +0000 Date: Sat, 26 Sep 2015 21:44:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Migration feature document X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 112e5346b048712e194fd1f99f1fb7720d10892b Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:27 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:27:42 2015 +0100 docs: Migration feature document Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- docs/features/migration.pandoc | 123 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/docs/features/migration.pandoc b/docs/features/migration.pandoc new file mode 100644 index 0000000..9852a19 --- /dev/null +++ b/docs/features/migration.pandoc @@ -0,0 +1,123 @@ +% Migration +% Revision 1 + +\clearpage + +# Basics +--------------- ------------- + Status: **Supported** + + Architecture: x86 + + Component: Toolstack +--------------- ------------- + +# Overview + +Migration is a mechanism to move a virtual machine while the VM is +running. Live migration moves a running virtual machine between two +physical servers, but the same mechanism can be used for non-live +migration (pause and copy) and suspend/resume from disk. + +# User details + +No hardware requirements, although hypervisor logdirty support is +required for live migration. + +From the command line, `xl migrate/save/restore` are the top level +interactions. e.g. + + xl create my-vm.cfg + xl migrate my-vm localhost + +or + + xl create my-vm.cfg + xl save my-vm /path/to/save/file + xl restore /path/to/save/file + +Xen 4.6 sees the introduction of Migration v2. There is no change for +people using `xl`, although the `libxl` API has had an extension. + +# Technical details + +Migration is formed of several layers. `libxc` is responsible for the +contents of the VM (ram, vcpus, etc) and the live migration loop, while +`libxl` is responsible for items such as emulator state. + +The format of the migration v2 stream is specified in two documents, and +is architecture neutral. Compatibility with legacy streams is +maintained via the `convert-legacy-stream` script which transforms a +legacy stream into a migration v2 stream. + +* Documents + * `docs/specs/libxc-migration-stream.pandoc` + * `docs/specs/libxl-migration-stream.pandoc` +* `libxc` + * `tools/libxc/xc_sr_*.[hc]` +* `libxl` + * `tools/libxl/libxl_stream_{read,write}.c` + * `tools/libxl/libxl_convert_callout.c` +* Scripts + * `tools/python/xen/migration/*.py` + * `tools/python/scripts/convert-legacy-stream` + * `tools/python/scripts/verify-stream-v2` + +## libxl + +With migration v2 support, LIBXL\_HAVE\_SRM\_V2 and LIBXL\_HAVE\_SRM\_V1 +are introduced to indicate support. `domain_restore_params` gains a new +parameter, `stream_version`, which is used to distinguish between legacy and +v2 migration streams, and hence whether legacy conversion is required. + +# Limitations + +Hypervisor logdirty support is incompatible with hardware passthrough, +as IOMMU faults cannot be used to track writes. + +While not a bug in migration specifically, VMs are very sensitive to +changes in cpuid information, and cpuid levelling support currently has +its issues. Extreme care should be taken when migrating VMs between +non-identical CPUs until the cpuid levelling improvements are complete. + +# Testing + +Changes in libxc should be tested with every guest type (32bit PV, 64bit +PV, HVM), while changes in libxl should test HVM guests with both +qemu-traditional and qemu-upstream. + +In general, testing can be done on a single host using `xl +save/restore` or `xl migrate $VM localhost`. + +Any changes to the conversion script should be tested in all upgrade +scenarios, which will involve starting with VMs from Xen 4.5 + +# Areas for improvement + +* Arm support +* Linear P2M support for x86 PV +* Live looping parameters + +# Known issues + +* x86 HVM guest physmap operations (not reflected in logdirty bitmap) +* x86 HVM with PoD pages (attempts to map cause PoD allocations) +* x86 HVM with nested-virt (no relevant information included in the + stream) +* x86 PV ballooning (P2M marked dirty, target frame not marked) +* x86 PV P2M structure changes (not noticed, stale mappings used) + +# References + +Xen Developer Summit 2015 Presentation +[video](https://www.youtube.com/watch?v=RwiDeG21lrc) and +[slides](http://events.linuxfoundation.org/sites/events/files/slides/migv2.pdf) +for Migration v2 + +# History + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +2015-10-24 1 Xen 4.6 Document written +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGX-0006Br-Pq; Sat, 26 Sep 2015 21:44:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGV-0006Be-RK for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:20 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id A3/EF-31450-3B117065; Sat, 26 Sep 2015 21:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1443303857!37966262!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 342 invoked from network); 26 Sep 2015 21:44:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGS-0003D5-VS for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGS-00020V-1T for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:16 +0000 Date: Sat, 26 Sep 2015 21:44:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs: Migration feature document X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 112e5346b048712e194fd1f99f1fb7720d10892b Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:27 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:27:42 2015 +0100 docs: Migration feature document Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- docs/features/migration.pandoc | 123 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/docs/features/migration.pandoc b/docs/features/migration.pandoc new file mode 100644 index 0000000..9852a19 --- /dev/null +++ b/docs/features/migration.pandoc @@ -0,0 +1,123 @@ +% Migration +% Revision 1 + +\clearpage + +# Basics +--------------- ------------- + Status: **Supported** + + Architecture: x86 + + Component: Toolstack +--------------- ------------- + +# Overview + +Migration is a mechanism to move a virtual machine while the VM is +running. Live migration moves a running virtual machine between two +physical servers, but the same mechanism can be used for non-live +migration (pause and copy) and suspend/resume from disk. + +# User details + +No hardware requirements, although hypervisor logdirty support is +required for live migration. + +From the command line, `xl migrate/save/restore` are the top level +interactions. e.g. + + xl create my-vm.cfg + xl migrate my-vm localhost + +or + + xl create my-vm.cfg + xl save my-vm /path/to/save/file + xl restore /path/to/save/file + +Xen 4.6 sees the introduction of Migration v2. There is no change for +people using `xl`, although the `libxl` API has had an extension. + +# Technical details + +Migration is formed of several layers. `libxc` is responsible for the +contents of the VM (ram, vcpus, etc) and the live migration loop, while +`libxl` is responsible for items such as emulator state. + +The format of the migration v2 stream is specified in two documents, and +is architecture neutral. Compatibility with legacy streams is +maintained via the `convert-legacy-stream` script which transforms a +legacy stream into a migration v2 stream. + +* Documents + * `docs/specs/libxc-migration-stream.pandoc` + * `docs/specs/libxl-migration-stream.pandoc` +* `libxc` + * `tools/libxc/xc_sr_*.[hc]` +* `libxl` + * `tools/libxl/libxl_stream_{read,write}.c` + * `tools/libxl/libxl_convert_callout.c` +* Scripts + * `tools/python/xen/migration/*.py` + * `tools/python/scripts/convert-legacy-stream` + * `tools/python/scripts/verify-stream-v2` + +## libxl + +With migration v2 support, LIBXL\_HAVE\_SRM\_V2 and LIBXL\_HAVE\_SRM\_V1 +are introduced to indicate support. `domain_restore_params` gains a new +parameter, `stream_version`, which is used to distinguish between legacy and +v2 migration streams, and hence whether legacy conversion is required. + +# Limitations + +Hypervisor logdirty support is incompatible with hardware passthrough, +as IOMMU faults cannot be used to track writes. + +While not a bug in migration specifically, VMs are very sensitive to +changes in cpuid information, and cpuid levelling support currently has +its issues. Extreme care should be taken when migrating VMs between +non-identical CPUs until the cpuid levelling improvements are complete. + +# Testing + +Changes in libxc should be tested with every guest type (32bit PV, 64bit +PV, HVM), while changes in libxl should test HVM guests with both +qemu-traditional and qemu-upstream. + +In general, testing can be done on a single host using `xl +save/restore` or `xl migrate $VM localhost`. + +Any changes to the conversion script should be tested in all upgrade +scenarios, which will involve starting with VMs from Xen 4.5 + +# Areas for improvement + +* Arm support +* Linear P2M support for x86 PV +* Live looping parameters + +# Known issues + +* x86 HVM guest physmap operations (not reflected in logdirty bitmap) +* x86 HVM with PoD pages (attempts to map cause PoD allocations) +* x86 HVM with nested-virt (no relevant information included in the + stream) +* x86 PV ballooning (P2M marked dirty, target frame not marked) +* x86 PV P2M structure changes (not noticed, stale mappings used) + +# References + +Xen Developer Summit 2015 Presentation +[video](https://www.youtube.com/watch?v=RwiDeG21lrc) and +[slides](http://events.linuxfoundation.org/sites/events/files/slides/migv2.pdf) +for Migration v2 + +# History + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +2015-10-24 1 Xen 4.6 Document written +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44: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 1ZfxGg-0006DJ-SJ; Sat, 26 Sep 2015 21:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGf-0006Cw-Ie for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:29 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id F9/E4-14422-CB117065; Sat, 26 Sep 2015 21:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1443303867!32702269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7870 invoked from network); 26 Sep 2015 21:44:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGd-0003DH-53 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGd-00021c-34 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:27 +0000 Date: Sat, 26 Sep 2015 21:44:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] INSTALL: Mention MINIOS_UPSTREAM_URL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f304da48779ef71bca723619ddf0b3bf6ae15c8a Author: Ian Campbell AuthorDate: Thu Sep 17 17:30:50 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:29:36 2015 +0100 INSTALL: Mention MINIOS_UPSTREAM_URL All the other ones seem to be there. Signed-off-by: Ian Campbell Release-acked-by: Wei Liu --- INSTALL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index 12615ab..56e2950 100644 --- a/INSTALL +++ b/INSTALL @@ -248,6 +248,7 @@ OVMF_UPSTREAM_URL= QEMU_UPSTREAM_URL= QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= +MINIOS_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 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44: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 1ZfxGg-0006DJ-SJ; Sat, 26 Sep 2015 21:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGf-0006Cw-Ie for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:29 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id F9/E4-14422-CB117065; Sat, 26 Sep 2015 21:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1443303867!32702269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7870 invoked from network); 26 Sep 2015 21:44:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGd-0003DH-53 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGd-00021c-34 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:27 +0000 Date: Sat, 26 Sep 2015 21:44:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] INSTALL: Mention MINIOS_UPSTREAM_URL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f304da48779ef71bca723619ddf0b3bf6ae15c8a Author: Ian Campbell AuthorDate: Thu Sep 17 17:30:50 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:29:36 2015 +0100 INSTALL: Mention MINIOS_UPSTREAM_URL All the other ones seem to be there. Signed-off-by: Ian Campbell Release-acked-by: Wei Liu --- INSTALL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index 12615ab..56e2950 100644 --- a/INSTALL +++ b/INSTALL @@ -248,6 +248,7 @@ OVMF_UPSTREAM_URL= QEMU_UPSTREAM_URL= QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= +MINIOS_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 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44: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 1ZfxGr-0006Eh-Uo; Sat, 26 Sep 2015 21:44:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGq-0006EX-2j for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:40 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B5/DD-10715-7C117065; Sat, 26 Sep 2015 21:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1443303877!53241003!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20647 invoked from network); 26 Sep 2015 21:44:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGn-0003DP-AK for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGn-00021z-88 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:37 +0000 Date: Sat, 26 Sep 2015 21:44:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: handle read-only drives with qemu-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 fa30003c13577b7ae4bbb46252ec1cbabd65c645 Author: Stefano Stabellini AuthorDate: Tue Sep 15 10:52:14 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:30:49 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b7c6592..8be5455 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1110,13 +1110,18 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback,id=ide-%i", - disk, dev_number); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback,id=ide-%i", + disk, disks[i].readwrite ? "off" : "on", dev_number); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback,id=ide-%i", - disks[i].pdev_path, disk, format, dev_number); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback,id=ide-%i", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return ERROR_INVAL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44: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 1ZfxGr-0006Eh-Uo; Sat, 26 Sep 2015 21:44:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGq-0006EX-2j for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:40 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id B5/DD-10715-7C117065; Sat, 26 Sep 2015 21:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1443303877!53241003!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20647 invoked from network); 26 Sep 2015 21:44:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGn-0003DP-AK for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGn-00021z-88 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:37 +0000 Date: Sat, 26 Sep 2015 21:44:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: handle read-only drives with qemu-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 fa30003c13577b7ae4bbb46252ec1cbabd65c645 Author: Stefano Stabellini AuthorDate: Tue Sep 15 10:52:14 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:30:49 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b7c6592..8be5455 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1110,13 +1110,18 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback,id=ide-%i", - disk, dev_number); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback,id=ide-%i", + disk, disks[i].readwrite ? "off" : "on", dev_number); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback,id=ide-%i", - disks[i].pdev_path, disk, format, dev_number); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback,id=ide-%i", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return ERROR_INVAL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxH2-0006Gb-2M; Sat, 26 Sep 2015 21:44:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxH0-0006GJ-Js for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:50 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 79/9F-06179-1D117065; Sat, 26 Sep 2015 21:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1443303888!37986524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18079 invoked from network); 26 Sep 2015 21:44:49 -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; 26 Sep 2015 21:44:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGy-0003DX-84 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGx-00022L-DF for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:47 +0000 Date: Sat, 26 Sep 2015 21:44:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct 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 493a67ee4a3fd9420e94fa2cf108e2a27961202b Author: Julien Grall AuthorDate: Thu Sep 17 19:00:03 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:31:45 2015 +0100 xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct size On GICv2, the GIC virtual CPU interface is at minimum 8KB. Due some to some necessary quirk for GIC using 64KB stride, we are mapping the region in 2 time. The first mapping is 4KB and the second one is 8KB, i.e 12KB in total. Although the minimum supported size (and widely used) is 8KB. This means that we are mapping 4KB more to any guest using GICv2. While this looks scary at first glance, the GIC virtual CPU interface is most frequently at the end the GIC I/O region. So we will most likely map an an unused I/O region or a mirrored version of GICV for platform using 64KB stride. Nonetheless, fix the second mapping to only map 4KB. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 524787b..fa71598 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -576,10 +576,10 @@ static int vgic_v2_domain_init(struct domain *d) if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); else ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); if ( ret ) return ret; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:44:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:44:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxH2-0006Gb-2M; Sat, 26 Sep 2015 21:44:52 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxH0-0006GJ-Js for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:50 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 79/9F-06179-1D117065; Sat, 26 Sep 2015 21:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1443303888!37986524!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18079 invoked from network); 26 Sep 2015 21:44:49 -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; 26 Sep 2015 21:44:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxGy-0003DX-84 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxGx-00022L-DF for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:47 +0000 Date: Sat, 26 Sep 2015 21:44:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct 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 493a67ee4a3fd9420e94fa2cf108e2a27961202b Author: Julien Grall AuthorDate: Thu Sep 17 19:00:03 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:31:45 2015 +0100 xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct size On GICv2, the GIC virtual CPU interface is at minimum 8KB. Due some to some necessary quirk for GIC using 64KB stride, we are mapping the region in 2 time. The first mapping is 4KB and the second one is 8KB, i.e 12KB in total. Although the minimum supported size (and widely used) is 8KB. This means that we are mapping 4KB more to any guest using GICv2. While this looks scary at first glance, the GIC virtual CPU interface is most frequently at the end the GIC I/O region. So we will most likely map an an unused I/O region or a mirrored version of GICV for platform using 64KB stride. Nonetheless, fix the second mapping to only map 4KB. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 524787b..fa71598 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -576,10 +576,10 @@ static int vgic_v2_domain_init(struct domain *d) if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); else ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); if ( ret ) return ret; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHC-0006IQ-4r; Sat, 26 Sep 2015 21:45:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHA-0006IA-TE for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:01 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 19/FF-05269-CD117065; Sat, 26 Sep 2015 21:45:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1443303898!47765412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 917 invoked from network); 26 Sep 2015 21:44:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxH8-0003Df-Ct for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxH8-00022j-Be for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:58 +0000 Date: Sat, 26 Sep 2015 21:44:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: arm: Check the index before accessing the bank X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed5c2c05cfa557b2391aef9557864d8d958d8d84 Author: Julien Grall AuthorDate: Thu Sep 17 18:36:36 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:32:50 2015 +0100 tools/libxc: arm: Check the index before accessing the bank When creating a guest with more than 3GB of memory, the 2 banks will be used and the loop with overrunning. The code will fail later on because Xen will deny to populate the region: domainbuilder: detail: xc_dom_devicetree_mem: called domainbuilder: detail: xc_dom_mem_init: mem 3096 MB, pages 0xc1800 pages, 4k each domainbuilder: detail: xc_dom_mem_init: 0xc1800 pages domainbuilder: detail: xc_dom_boot_mem_init: called domainbuilder: detail: set_mode: guest xen-3.0-aarch64, address size 64 domainbuilder: detail: xc_dom_malloc : 14384 kB domainbuilder: detail: populate_guest_memory: populating RAM @0000000040000000-0000000100000000 (3072MB) domainbuilder: detail: populate_one_size: populated 0x3/0x3 entries with shift 18 domainbuilder: detail: populate_guest_memory: populating RAM @0000000200000000-0000000201800000 (24MB) domainbuilder: detail: populate_one_size: populated 0xc/0xc entries with shift 9 domainbuilder: detail: populate_guest_memory: populating RAM @0000007fad41c000-0007fb39dd42c000 (2141954816MB) domainbuilder: detail: populate_one_size: populated 0x100/0x1e4 entries with shift 0 domainbuilder: detail: populate_guest_memory: Not enough RAM This is because we are currently accessing the bank before checking the validity of the index. AFAICT, on Debian Jessie, the compiler (gcc 4.9.2) is assuming that it's not necessary to verify the index because it's used before. This is a valid assumption because the operand of && are execute from from left to right. Re-order the checks to verify the validity of the index before accessing the bank. The problem has been present since the introduction of the multi-bank feature in commit 45d9867837f099e9eed4189dac5ed39d1fe2ed49 " tools: arm: prepare domain builder for multiple banks of guest RAM". Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/libxc/xc_dom_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index b00d667..aeaba54 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -460,7 +460,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) dom->p2m_host[pfn] = INVALID_P2M_ENTRY; /* setup initial p2m and allocate guest memory */ - for ( i = 0; dom->rambank_size[i] && i < GUEST_RAM_BANKS; i++ ) + for ( i = 0; i < GUEST_RAM_BANKS && dom->rambank_size[i]; i++ ) { if ((rc = populate_guest_memory(dom, bankbase[i] >> XC_PAGE_SHIFT, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHC-0006IQ-4r; Sat, 26 Sep 2015 21:45:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHA-0006IA-TE for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:01 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 19/FF-05269-CD117065; Sat, 26 Sep 2015 21:45:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1443303898!47765412!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 917 invoked from network); 26 Sep 2015 21:44:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:44:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxH8-0003Df-Ct for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxH8-00022j-Be for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:44:58 +0000 Date: Sat, 26 Sep 2015 21:44:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: arm: Check the index before accessing the bank X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ed5c2c05cfa557b2391aef9557864d8d958d8d84 Author: Julien Grall AuthorDate: Thu Sep 17 18:36:36 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:32:50 2015 +0100 tools/libxc: arm: Check the index before accessing the bank When creating a guest with more than 3GB of memory, the 2 banks will be used and the loop with overrunning. The code will fail later on because Xen will deny to populate the region: domainbuilder: detail: xc_dom_devicetree_mem: called domainbuilder: detail: xc_dom_mem_init: mem 3096 MB, pages 0xc1800 pages, 4k each domainbuilder: detail: xc_dom_mem_init: 0xc1800 pages domainbuilder: detail: xc_dom_boot_mem_init: called domainbuilder: detail: set_mode: guest xen-3.0-aarch64, address size 64 domainbuilder: detail: xc_dom_malloc : 14384 kB domainbuilder: detail: populate_guest_memory: populating RAM @0000000040000000-0000000100000000 (3072MB) domainbuilder: detail: populate_one_size: populated 0x3/0x3 entries with shift 18 domainbuilder: detail: populate_guest_memory: populating RAM @0000000200000000-0000000201800000 (24MB) domainbuilder: detail: populate_one_size: populated 0xc/0xc entries with shift 9 domainbuilder: detail: populate_guest_memory: populating RAM @0000007fad41c000-0007fb39dd42c000 (2141954816MB) domainbuilder: detail: populate_one_size: populated 0x100/0x1e4 entries with shift 0 domainbuilder: detail: populate_guest_memory: Not enough RAM This is because we are currently accessing the bank before checking the validity of the index. AFAICT, on Debian Jessie, the compiler (gcc 4.9.2) is assuming that it's not necessary to verify the index because it's used before. This is a valid assumption because the operand of && are execute from from left to right. Re-order the checks to verify the validity of the index before accessing the bank. The problem has been present since the introduction of the multi-bank feature in commit 45d9867837f099e9eed4189dac5ed39d1fe2ed49 " tools: arm: prepare domain builder for multiple banks of guest RAM". Signed-off-by: Julien Grall Acked-by: Ian Campbell --- tools/libxc/xc_dom_arm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index b00d667..aeaba54 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -460,7 +460,7 @@ int arch_setup_meminit(struct xc_dom_image *dom) dom->p2m_host[pfn] = INVALID_P2M_ENTRY; /* setup initial p2m and allocate guest memory */ - for ( i = 0; dom->rambank_size[i] && i < GUEST_RAM_BANKS; i++ ) + for ( i = 0; i < GUEST_RAM_BANKS && dom->rambank_size[i]; i++ ) { if ((rc = populate_guest_memory(dom, bankbase[i] >> XC_PAGE_SHIFT, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45: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 1ZfxHN-0006K9-7Y; Sat, 26 Sep 2015 21:45:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHL-0006Ju-PW for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:11 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 93/93-24856-7E117065; Sat, 26 Sep 2015 21:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1443303909!37971701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14329 invoked from network); 26 Sep 2015 21:45:10 -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; 26 Sep 2015 21:45:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHJ-0003Ei-9s for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHI-00023U-Ff for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:09 +0000 Date: Sat, 26 Sep 2015 21:45:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: drop unused SUBARCH variable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 063792541db41167db9467feadb700de64cfcd16 Author: Doug Goldstein AuthorDate: Mon Sep 21 16:14:19 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 21 16:14:19 2015 +0200 build: drop unused SUBARCH variable This variable appears to be unused throughout the code base. Signed-off-by: Doug Goldstein --- Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 75177f0..8a9331f 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,7 @@ mini-os-dir-force-update: mini-os-dir $(GIT) reset --hard $(MINIOS_UPSTREAM_REVISION); \ fi -SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH)) -export XEN_TARGET_ARCH SUBARCH +export XEN_TARGET_ARCH export DESTDIR # build and install everything into the standard system directories -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45: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 1ZfxHN-0006K9-7Y; Sat, 26 Sep 2015 21:45:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHL-0006Ju-PW for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:11 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 93/93-24856-7E117065; Sat, 26 Sep 2015 21:45:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1443303909!37971701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14329 invoked from network); 26 Sep 2015 21:45:10 -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; 26 Sep 2015 21:45:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHJ-0003Ei-9s for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHI-00023U-Ff for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:09 +0000 Date: Sat, 26 Sep 2015 21:45:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: drop unused SUBARCH variable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 063792541db41167db9467feadb700de64cfcd16 Author: Doug Goldstein AuthorDate: Mon Sep 21 16:14:19 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 21 16:14:19 2015 +0200 build: drop unused SUBARCH variable This variable appears to be unused throughout the code base. Signed-off-by: Doug Goldstein --- Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 75177f0..8a9331f 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,7 @@ mini-os-dir-force-update: mini-os-dir $(GIT) reset --hard $(MINIOS_UPSTREAM_REVISION); \ fi -SUBARCH := $(subst x86_32,i386,$(XEN_TARGET_ARCH)) -export XEN_TARGET_ARCH SUBARCH +export XEN_TARGET_ARCH export DESTDIR # build and install everything into the standard system directories -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHX-0006Lw-C4; Sat, 26 Sep 2015 21:45:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHW-0006Lj-Ct for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:22 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 09/29-25435-1F117065; Sat, 26 Sep 2015 21:45:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1443303919!50837550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10577 invoked from network); 26 Sep 2015 21:45:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHT-0003Eq-Ee for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHT-00023s-DD for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:19 +0000 Date: Sat, 26 Sep 2015 21:45:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: update VT-x 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 0ffbb4ed178c5f1900d20a14a340631501d251d0 Author: Kevin Tian AuthorDate: Mon Sep 21 16:15:13 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 21 16:15:13 2015 +0200 MAINTAINERS: update VT-x maintainers Eddie will not act as a VT-x maintainer anymore. So remove him from the list. Signed-off-by: Kevin Tian --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a6bece6..e430ade 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -199,7 +199,6 @@ F: xen/drivers/passthrough/vtd/ INTEL(R) VT FOR X86 (VT-X) M: Jun Nakajima -M: Eddie Dong M: Kevin Tian S: Supported F: xen/arch/x86/hvm/vmx/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHX-0006Lw-C4; Sat, 26 Sep 2015 21:45:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHW-0006Lj-Ct for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:22 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 09/29-25435-1F117065; Sat, 26 Sep 2015 21:45:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1443303919!50837550!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_DONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10577 invoked from network); 26 Sep 2015 21:45:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:45:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHT-0003Eq-Ee for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHT-00023s-DD for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:19 +0000 Date: Sat, 26 Sep 2015 21:45:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: update VT-x 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 0ffbb4ed178c5f1900d20a14a340631501d251d0 Author: Kevin Tian AuthorDate: Mon Sep 21 16:15:13 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 21 16:15:13 2015 +0200 MAINTAINERS: update VT-x maintainers Eddie will not act as a VT-x maintainer anymore. So remove him from the list. Signed-off-by: Kevin Tian --- MAINTAINERS | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a6bece6..e430ade 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -199,7 +199,6 @@ F: xen/drivers/passthrough/vtd/ INTEL(R) VT FOR X86 (VT-X) M: Jun Nakajima -M: Eddie Dong M: Kevin Tian S: Supported F: xen/arch/x86/hvm/vmx/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45: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 1ZfxHh-0006NK-ET; Sat, 26 Sep 2015 21:45:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHg-0006NC-Jr for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:32 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 04/19-09570-BF117065; Sat, 26 Sep 2015 21:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1443303930!15924120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15963 invoked from network); 26 Sep 2015 21:45:30 -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; 26 Sep 2015 21:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHd-0003Ey-Q0 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHd-000256-OK for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:29 +0000 Date: Sat, 26 Sep 2015 21:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] improve x86's alloc_vcpu_guest_context() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ac27e8457674b9266c908eaa9fc4054bb3d4dbe Author: Andrew Cooper AuthorDate: Tue Sep 22 12:42:21 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:42:21 2015 +0200 improve x86's alloc_vcpu_guest_context() This essentially reverts c/s 2037f2adb "x86: introduce alloc_vcpu_guest_context()", including the newer arm bits, but achieves the same end goal by using the newer vmalloc() infrastructure. For both x86 and ARM, {alloc,free}_vcpu_guest_context() become arch-local static inlines (which avoids a call into a separate translation), and removes an x86 scalability limit when compiling with a large NR_CPUS. Signed-off-by: Andrew Cooper Reviewed-by: Julien Grall Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 11 ---------- xen/arch/x86/domain.c | 46 ------------------------------------------ xen/include/asm-arm/domain.h | 10 +++++++++ xen/include/asm-x86/domain.h | 10 +++++++++ xen/include/asm-x86/fixmap.h | 3 -- xen/include/xen/domain.h | 6 ----- 6 files changed, 20 insertions(+), 66 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 5bdc2e9..575745c 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -466,17 +466,6 @@ void free_vcpu_struct(struct vcpu *v) free_xenheap_page(v); } -struct vcpu_guest_context *alloc_vcpu_guest_context(void) -{ - return xmalloc(struct vcpu_guest_context); - -} - -void free_vcpu_guest_context(struct vcpu_guest_context *vgc) -{ - xfree(vgc); -} - int vcpu_initialise(struct vcpu *v) { int rc = 0; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5ff09e7..0b97912 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -272,51 +271,6 @@ void free_vcpu_struct(struct vcpu *v) free_xenheap_page(v); } -static DEFINE_PER_CPU(struct page_info *[ - PFN_UP(sizeof(struct vcpu_guest_context))], vgc_pages); - -struct vcpu_guest_context *alloc_vcpu_guest_context(void) -{ - unsigned int i, cpu = smp_processor_id(); - enum fixed_addresses idx = FIX_VGC_BEGIN - - cpu * PFN_UP(sizeof(struct vcpu_guest_context)); - - BUG_ON(per_cpu(vgc_pages[0], cpu) != NULL); - - for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) - { - struct page_info *pg = alloc_domheap_page(current->domain, - MEMF_no_owner); - - if ( unlikely(pg == NULL) ) - { - free_vcpu_guest_context(NULL); - return NULL; - } - __set_fixmap(idx - i, page_to_mfn(pg), __PAGE_HYPERVISOR_RW); - per_cpu(vgc_pages[i], cpu) = pg; - } - return (void *)fix_to_virt(idx); -} - -void free_vcpu_guest_context(struct vcpu_guest_context *vgc) -{ - unsigned int i, cpu = smp_processor_id(); - enum fixed_addresses idx = FIX_VGC_BEGIN - - cpu * PFN_UP(sizeof(struct vcpu_guest_context)); - - BUG_ON(vgc && vgc != (void *)fix_to_virt(idx)); - - for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) - { - if ( !per_cpu(vgc_pages[i], cpu) ) - continue; - clear_fixmap(idx - i); - free_domheap_page(per_cpu(vgc_pages[i], cpu)); - per_cpu(vgc_pages[i], cpu) = NULL; - } -} - static int setup_compat_l4(struct vcpu *v) { struct page_info *pg; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 7ddaeaa..c3f5a95 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -300,6 +300,16 @@ static inline register_t vcpuid_to_vaffinity(unsigned int vcpuid) return vaff; } +static inline struct vcpu_guest_context *alloc_vcpu_guest_context(void) +{ + return xmalloc(struct vcpu_guest_context); +} + +static inline void free_vcpu_guest_context(struct vcpu_guest_context *vgc) +{ + xfree(vgc); +} + #endif /* __ASM_DOMAIN_H__ */ /* diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 59cf826..f0aeade 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -576,6 +576,16 @@ void domain_cpuid(struct domain *d, #define domain_max_vcpus(d) (is_hvm_domain(d) ? HVM_MAX_VCPUS : MAX_VIRT_CPUS) +static inline struct vcpu_guest_context *alloc_vcpu_guest_context(void) +{ + return vmalloc(sizeof(struct vcpu_guest_context)); +} + +static inline void free_vcpu_guest_context(struct vcpu_guest_context *vgc) +{ + vfree(vgc); +} + #endif /* __ASM_DOMAIN_H__ */ /* diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 70eadff..1e24b11 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -47,9 +47,6 @@ enum fixed_addresses { FIX_COM_END, FIX_EHCI_DBGP, /* Everything else should go further down. */ - FIX_VGC_END, - FIX_VGC_BEGIN = FIX_VGC_END - + PFN_UP(sizeof(struct vcpu_guest_context)) * NR_CPUS - 1, FIX_APIC_BASE, FIX_IO_APIC_BASE_0, FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1, diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index a469fe0..3dca3f6 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -31,12 +31,6 @@ void free_domain_struct(struct domain *d); struct vcpu *alloc_vcpu_struct(void); void free_vcpu_struct(struct vcpu *v); -/* Allocate/free a vcpu_guest_context structure. */ -#ifndef alloc_vcpu_guest_context -struct vcpu_guest_context *alloc_vcpu_guest_context(void); -void free_vcpu_guest_context(struct vcpu_guest_context *); -#endif - /* Allocate/free a PIRQ structure. */ #ifndef alloc_pirq_struct struct pirq *alloc_pirq_struct(struct domain *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45: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 1ZfxHh-0006NK-ET; Sat, 26 Sep 2015 21:45:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHg-0006NC-Jr for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:32 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 04/19-09570-BF117065; Sat, 26 Sep 2015 21:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1443303930!15924120!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15963 invoked from network); 26 Sep 2015 21:45:30 -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; 26 Sep 2015 21:45:30 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHd-0003Ey-Q0 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHd-000256-OK for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:29 +0000 Date: Sat, 26 Sep 2015 21:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] improve x86's alloc_vcpu_guest_context() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0ac27e8457674b9266c908eaa9fc4054bb3d4dbe Author: Andrew Cooper AuthorDate: Tue Sep 22 12:42:21 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:42:21 2015 +0200 improve x86's alloc_vcpu_guest_context() This essentially reverts c/s 2037f2adb "x86: introduce alloc_vcpu_guest_context()", including the newer arm bits, but achieves the same end goal by using the newer vmalloc() infrastructure. For both x86 and ARM, {alloc,free}_vcpu_guest_context() become arch-local static inlines (which avoids a call into a separate translation), and removes an x86 scalability limit when compiling with a large NR_CPUS. Signed-off-by: Andrew Cooper Reviewed-by: Julien Grall Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 11 ---------- xen/arch/x86/domain.c | 46 ------------------------------------------ xen/include/asm-arm/domain.h | 10 +++++++++ xen/include/asm-x86/domain.h | 10 +++++++++ xen/include/asm-x86/fixmap.h | 3 -- xen/include/xen/domain.h | 6 ----- 6 files changed, 20 insertions(+), 66 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 5bdc2e9..575745c 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -466,17 +466,6 @@ void free_vcpu_struct(struct vcpu *v) free_xenheap_page(v); } -struct vcpu_guest_context *alloc_vcpu_guest_context(void) -{ - return xmalloc(struct vcpu_guest_context); - -} - -void free_vcpu_guest_context(struct vcpu_guest_context *vgc) -{ - xfree(vgc); -} - int vcpu_initialise(struct vcpu *v) { int rc = 0; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 5ff09e7..0b97912 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -48,7 +48,6 @@ #include #include #include -#include #include #include #include @@ -272,51 +271,6 @@ void free_vcpu_struct(struct vcpu *v) free_xenheap_page(v); } -static DEFINE_PER_CPU(struct page_info *[ - PFN_UP(sizeof(struct vcpu_guest_context))], vgc_pages); - -struct vcpu_guest_context *alloc_vcpu_guest_context(void) -{ - unsigned int i, cpu = smp_processor_id(); - enum fixed_addresses idx = FIX_VGC_BEGIN - - cpu * PFN_UP(sizeof(struct vcpu_guest_context)); - - BUG_ON(per_cpu(vgc_pages[0], cpu) != NULL); - - for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) - { - struct page_info *pg = alloc_domheap_page(current->domain, - MEMF_no_owner); - - if ( unlikely(pg == NULL) ) - { - free_vcpu_guest_context(NULL); - return NULL; - } - __set_fixmap(idx - i, page_to_mfn(pg), __PAGE_HYPERVISOR_RW); - per_cpu(vgc_pages[i], cpu) = pg; - } - return (void *)fix_to_virt(idx); -} - -void free_vcpu_guest_context(struct vcpu_guest_context *vgc) -{ - unsigned int i, cpu = smp_processor_id(); - enum fixed_addresses idx = FIX_VGC_BEGIN - - cpu * PFN_UP(sizeof(struct vcpu_guest_context)); - - BUG_ON(vgc && vgc != (void *)fix_to_virt(idx)); - - for ( i = 0; i < PFN_UP(sizeof(struct vcpu_guest_context)); ++i ) - { - if ( !per_cpu(vgc_pages[i], cpu) ) - continue; - clear_fixmap(idx - i); - free_domheap_page(per_cpu(vgc_pages[i], cpu)); - per_cpu(vgc_pages[i], cpu) = NULL; - } -} - static int setup_compat_l4(struct vcpu *v) { struct page_info *pg; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 7ddaeaa..c3f5a95 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -300,6 +300,16 @@ static inline register_t vcpuid_to_vaffinity(unsigned int vcpuid) return vaff; } +static inline struct vcpu_guest_context *alloc_vcpu_guest_context(void) +{ + return xmalloc(struct vcpu_guest_context); +} + +static inline void free_vcpu_guest_context(struct vcpu_guest_context *vgc) +{ + xfree(vgc); +} + #endif /* __ASM_DOMAIN_H__ */ /* diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 59cf826..f0aeade 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -576,6 +576,16 @@ void domain_cpuid(struct domain *d, #define domain_max_vcpus(d) (is_hvm_domain(d) ? HVM_MAX_VCPUS : MAX_VIRT_CPUS) +static inline struct vcpu_guest_context *alloc_vcpu_guest_context(void) +{ + return vmalloc(sizeof(struct vcpu_guest_context)); +} + +static inline void free_vcpu_guest_context(struct vcpu_guest_context *vgc) +{ + vfree(vgc); +} + #endif /* __ASM_DOMAIN_H__ */ /* diff --git a/xen/include/asm-x86/fixmap.h b/xen/include/asm-x86/fixmap.h index 70eadff..1e24b11 100644 --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -47,9 +47,6 @@ enum fixed_addresses { FIX_COM_END, FIX_EHCI_DBGP, /* Everything else should go further down. */ - FIX_VGC_END, - FIX_VGC_BEGIN = FIX_VGC_END - + PFN_UP(sizeof(struct vcpu_guest_context)) * NR_CPUS - 1, FIX_APIC_BASE, FIX_IO_APIC_BASE_0, FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1, diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index a469fe0..3dca3f6 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -31,12 +31,6 @@ void free_domain_struct(struct domain *d); struct vcpu *alloc_vcpu_struct(void); void free_vcpu_struct(struct vcpu *v); -/* Allocate/free a vcpu_guest_context structure. */ -#ifndef alloc_vcpu_guest_context -struct vcpu_guest_context *alloc_vcpu_guest_context(void); -void free_vcpu_guest_context(struct vcpu_guest_context *); -#endif - /* Allocate/free a PIRQ structure. */ #ifndef alloc_pirq_struct struct pirq *alloc_pirq_struct(struct domain *); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:45:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHr-0006Oh-H1; Sat, 26 Sep 2015 21:45:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHq-0006OW-JZ for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:42 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 2A/1E-10715-50217065; Sat, 26 Sep 2015 21:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1443303940!53324506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9949 invoked from network); 26 Sep 2015 21:45:41 -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; 26 Sep 2015 21:45:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHn-0003F6-Vo for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHn-00025S-Ua for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:39 +0000 Date: Sat, 26 Sep 2015 21:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EPT: always return proper order value from ept_get_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 3fde8ad95e4bfb5c256ab87a76acaa076f68be6c Author: Jan Beulich AuthorDate: Tue Sep 22 12:45:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:45:03 2015 +0200 x86/EPT: always return proper order value from ept_get_entry() This is so that callers can determine what range of address space would get altered by a corresponding "set". Signed-off-by: Jan Beulich Acked-by: Kevin Tian Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m-ept.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 2f3df91..58db34e 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -879,7 +879,13 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, /* This pfn is higher than the highest the p2m map currently holds */ if ( gfn > p2m->max_mapped_pfn ) + { + for ( i = ept_get_wl(ept); i > 0; --i ) + if ( (gfn & ~((1UL << (i * EPT_TABLE_ORDER)) - 1)) > + p2m->max_mapped_pfn ) + break; goto out; + } /* Should check if gfn obeys GAW here. */ @@ -956,12 +962,12 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, ((1 << (i * EPT_TABLE_ORDER)) - 1)); mfn = _mfn(split_mfn); } - - if ( page_order ) - *page_order = i * EPT_TABLE_ORDER; } -out: + out: + if ( page_order ) + *page_order = i * EPT_TABLE_ORDER; + unmap_domain_page(table); return 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 Sat Sep 26 21:45:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHr-0006Oh-H1; Sat, 26 Sep 2015 21:45:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHq-0006OW-JZ for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:42 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 2A/1E-10715-50217065; Sat, 26 Sep 2015 21:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1443303940!53324506!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9949 invoked from network); 26 Sep 2015 21:45:41 -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; 26 Sep 2015 21:45:41 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHn-0003F6-Vo for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHn-00025S-Ua for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:39 +0000 Date: Sat, 26 Sep 2015 21:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/EPT: always return proper order value from ept_get_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 3fde8ad95e4bfb5c256ab87a76acaa076f68be6c Author: Jan Beulich AuthorDate: Tue Sep 22 12:45:03 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:45:03 2015 +0200 x86/EPT: always return proper order value from ept_get_entry() This is so that callers can determine what range of address space would get altered by a corresponding "set". Signed-off-by: Jan Beulich Acked-by: Kevin Tian Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m-ept.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 2f3df91..58db34e 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -879,7 +879,13 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, /* This pfn is higher than the highest the p2m map currently holds */ if ( gfn > p2m->max_mapped_pfn ) + { + for ( i = ept_get_wl(ept); i > 0; --i ) + if ( (gfn & ~((1UL << (i * EPT_TABLE_ORDER)) - 1)) > + p2m->max_mapped_pfn ) + break; goto out; + } /* Should check if gfn obeys GAW here. */ @@ -956,12 +962,12 @@ static mfn_t ept_get_entry(struct p2m_domain *p2m, ((1 << (i * EPT_TABLE_ORDER)) - 1)); mfn = _mfn(split_mfn); } - - if ( page_order ) - *page_order = i * EPT_TABLE_ORDER; } -out: + out: + if ( page_order ) + *page_order = i * EPT_TABLE_ORDER; + unmap_domain_page(table); return 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 Sat Sep 26 21:45:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxI1-0006QB-JX; Sat, 26 Sep 2015 21:45:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxI0-0006Q2-J6 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:52 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id A1/EA-21201-F0217065; Sat, 26 Sep 2015 21:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1443303950!10992243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9199 invoked from network); 26 Sep 2015 21:45:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:45:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHy-0003FE-42 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHy-00025o-2i for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:50 +0000 Date: Sat, 26 Sep 2015 21:45:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NPT: always return proper order value from p2m_pt_get_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 31c0fd409a619e316ded36bc1ce594fe8861ecc7 Author: Jan Beulich AuthorDate: Tue Sep 22 12:45:32 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:45:32 2015 +0200 x86/NPT: always return proper order value from p2m_pt_get_entry() This is so that callers can determine what range of address space would get altered by a corresponding "set". Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m-pt.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 1a77cc8..8031c50 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -715,14 +715,26 @@ p2m_pt_get_entry(struct p2m_domain *p2m, unsigned long gfn, *a = p2m_access_rwx; if ( gfn > p2m->max_mapped_pfn ) + { /* This pfn is higher than the highest the p2m map currently holds */ + if ( page_order ) + { + for ( *page_order = 3 * PAGETABLE_ORDER; *page_order; + *page_order -= PAGETABLE_ORDER ) + if ( (gfn & ~((1UL << *page_order) - 1)) > + p2m->max_mapped_pfn ) + break; + } return _mfn(INVALID_MFN); + } mfn = pagetable_get_mfn(p2m_get_pagetable(p2m)); { l4_pgentry_t *l4e = map_domain_page(mfn); l4e += l4_table_offset(addr); + if ( page_order ) + *page_order = 3 * PAGETABLE_ORDER; if ( (l4e_get_flags(*l4e) & _PAGE_PRESENT) == 0 ) { unmap_domain_page(l4e); @@ -735,6 +747,9 @@ p2m_pt_get_entry(struct p2m_domain *p2m, unsigned long gfn, { l3_pgentry_t *l3e = map_domain_page(mfn); l3e += l3_table_offset(addr); + if ( page_order ) + *page_order = 2 * PAGETABLE_ORDER; + pod_retry_l3: flags = l3e_get_flags(*l3e); if ( !(flags & _PAGE_PRESENT) ) @@ -763,8 +778,6 @@ pod_retry_l3: unmap_domain_page(l3e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t)); - if ( page_order ) - *page_order = PAGE_ORDER_1G; return (p2m_is_valid(*t)) ? mfn : _mfn(INVALID_MFN); } @@ -776,6 +789,8 @@ pod_retry_l3: l2e = map_domain_page(mfn); l2e += l2_table_offset(addr); + if ( page_order ) + *page_order = PAGETABLE_ORDER; pod_retry_l2: flags = l2e_get_flags(*l2e); @@ -802,8 +817,6 @@ pod_retry_l2: unmap_domain_page(l2e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t)); - if ( page_order ) - *page_order = PAGE_ORDER_2M; return (p2m_is_valid(*t)) ? mfn : _mfn(INVALID_MFN); } @@ -814,6 +827,9 @@ pod_retry_l2: l1e = map_domain_page(mfn); l1e += l1_table_offset(addr); + if ( page_order ) + *page_order = 0; + pod_retry_l1: flags = l1e_get_flags(*l1e); l1t = p2m_flags_to_type(flags); @@ -837,8 +853,6 @@ pod_retry_l1: unmap_domain_page(l1e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t) || p2m_is_paging(*t)); - if ( page_order ) - *page_order = PAGE_ORDER_4K; return (p2m_is_valid(*t) || p2m_is_grant(*t)) ? mfn : _mfn(INVALID_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 Sat Sep 26 21:45:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:45:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxI1-0006QB-JX; Sat, 26 Sep 2015 21:45:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxI0-0006Q2-J6 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:52 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id A1/EA-21201-F0217065; Sat, 26 Sep 2015 21:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1443303950!10992243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9199 invoked from network); 26 Sep 2015 21:45:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:45:51 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxHy-0003FE-42 for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxHy-00025o-2i for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:45:50 +0000 Date: Sat, 26 Sep 2015 21:45:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NPT: always return proper order value from p2m_pt_get_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 31c0fd409a619e316ded36bc1ce594fe8861ecc7 Author: Jan Beulich AuthorDate: Tue Sep 22 12:45:32 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:45:32 2015 +0200 x86/NPT: always return proper order value from p2m_pt_get_entry() This is so that callers can determine what range of address space would get altered by a corresponding "set". Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/p2m-pt.c | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 1a77cc8..8031c50 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -715,14 +715,26 @@ p2m_pt_get_entry(struct p2m_domain *p2m, unsigned long gfn, *a = p2m_access_rwx; if ( gfn > p2m->max_mapped_pfn ) + { /* This pfn is higher than the highest the p2m map currently holds */ + if ( page_order ) + { + for ( *page_order = 3 * PAGETABLE_ORDER; *page_order; + *page_order -= PAGETABLE_ORDER ) + if ( (gfn & ~((1UL << *page_order) - 1)) > + p2m->max_mapped_pfn ) + break; + } return _mfn(INVALID_MFN); + } mfn = pagetable_get_mfn(p2m_get_pagetable(p2m)); { l4_pgentry_t *l4e = map_domain_page(mfn); l4e += l4_table_offset(addr); + if ( page_order ) + *page_order = 3 * PAGETABLE_ORDER; if ( (l4e_get_flags(*l4e) & _PAGE_PRESENT) == 0 ) { unmap_domain_page(l4e); @@ -735,6 +747,9 @@ p2m_pt_get_entry(struct p2m_domain *p2m, unsigned long gfn, { l3_pgentry_t *l3e = map_domain_page(mfn); l3e += l3_table_offset(addr); + if ( page_order ) + *page_order = 2 * PAGETABLE_ORDER; + pod_retry_l3: flags = l3e_get_flags(*l3e); if ( !(flags & _PAGE_PRESENT) ) @@ -763,8 +778,6 @@ pod_retry_l3: unmap_domain_page(l3e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t)); - if ( page_order ) - *page_order = PAGE_ORDER_1G; return (p2m_is_valid(*t)) ? mfn : _mfn(INVALID_MFN); } @@ -776,6 +789,8 @@ pod_retry_l3: l2e = map_domain_page(mfn); l2e += l2_table_offset(addr); + if ( page_order ) + *page_order = PAGETABLE_ORDER; pod_retry_l2: flags = l2e_get_flags(*l2e); @@ -802,8 +817,6 @@ pod_retry_l2: unmap_domain_page(l2e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t)); - if ( page_order ) - *page_order = PAGE_ORDER_2M; return (p2m_is_valid(*t)) ? mfn : _mfn(INVALID_MFN); } @@ -814,6 +827,9 @@ pod_retry_l2: l1e = map_domain_page(mfn); l1e += l1_table_offset(addr); + if ( page_order ) + *page_order = 0; + pod_retry_l1: flags = l1e_get_flags(*l1e); l1t = p2m_flags_to_type(flags); @@ -837,8 +853,6 @@ pod_retry_l1: unmap_domain_page(l1e); ASSERT(mfn_valid(mfn) || !p2m_is_ram(*t) || p2m_is_paging(*t)); - if ( page_order ) - *page_order = PAGE_ORDER_4K; return (p2m_is_valid(*t) || p2m_is_grant(*t)) ? mfn : _mfn(INVALID_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 Sat Sep 26 21:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIB-0006Ri-MH; Sat, 26 Sep 2015 21:46:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIA-0006RS-Iu for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:02 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 0D/3B-16965-91217065; Sat, 26 Sep 2015 21:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1443303960!45479349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18686 invoked from network); 26 Sep 2015 21:46:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxI8-0003FJ-9H for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxI8-00026A-7g for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:00 +0000 Date: Sat, 26 Sep 2015 21:46:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU: complete/correct comment explaining "iommu=" sub-options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5790ef286377fae5682367ffe361bc35662a2ed2 Author: Jan Beulich AuthorDate: Tue Sep 22 12:48:43 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:48:43 2015 +0200 IOMMU: complete/correct comment explaining "iommu=" sub-options Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/drivers/passthrough/iommu.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index d5137733..aee9d82 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -31,13 +31,19 @@ static void iommu_dump_p2m_table(unsigned char key); * * off|no|false|disable Disable IOMMU (default) * force|required Don't boot unless IOMMU is enabled + * no-intremap Disable interrupt remapping + * verbose Be more verbose + * debug Enable debugging messages and checks * workaround_bios_bug Workaround some bios issue to still enable - VT-d, don't guarantee security + * VT-d, don't guarantee security * dom0-passthrough No DMA translation at all for Dom0 * dom0-strict No 1:1 memory mapping for Dom0 + * no-sharept Don't share VT-d and EPT page tables * no-snoop Disable VT-d Snoop Control * no-qinval Disable VT-d Queued Invalidation - * no-intremap Disable VT-d Interrupt Remapping + * no-igfx Disable VT-d for IGD devices (insecure) + * no-amd-iommu-perdev-intremap Don't use per-device interrupt remapping + * tables (insecure) */ custom_param("iommu", parse_iommu_param); bool_t __initdata iommu_enable = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIB-0006Ri-MH; Sat, 26 Sep 2015 21:46:03 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIA-0006RS-Iu for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:02 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 0D/3B-16965-91217065; Sat, 26 Sep 2015 21:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1443303960!45479349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18686 invoked from network); 26 Sep 2015 21:46:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:01 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxI8-0003FJ-9H for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxI8-00026A-7g for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:00 +0000 Date: Sat, 26 Sep 2015 21:46:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] IOMMU: complete/correct comment explaining "iommu=" sub-options X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5790ef286377fae5682367ffe361bc35662a2ed2 Author: Jan Beulich AuthorDate: Tue Sep 22 12:48:43 2015 +0200 Commit: Jan Beulich CommitDate: Tue Sep 22 12:48:43 2015 +0200 IOMMU: complete/correct comment explaining "iommu=" sub-options Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/drivers/passthrough/iommu.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index d5137733..aee9d82 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -31,13 +31,19 @@ static void iommu_dump_p2m_table(unsigned char key); * * off|no|false|disable Disable IOMMU (default) * force|required Don't boot unless IOMMU is enabled + * no-intremap Disable interrupt remapping + * verbose Be more verbose + * debug Enable debugging messages and checks * workaround_bios_bug Workaround some bios issue to still enable - VT-d, don't guarantee security + * VT-d, don't guarantee security * dom0-passthrough No DMA translation at all for Dom0 * dom0-strict No 1:1 memory mapping for Dom0 + * no-sharept Don't share VT-d and EPT page tables * no-snoop Disable VT-d Snoop Control * no-qinval Disable VT-d Queued Invalidation - * no-intremap Disable VT-d Interrupt Remapping + * no-igfx Disable VT-d for IGD devices (insecure) + * no-amd-iommu-perdev-intremap Don't use per-device interrupt remapping + * tables (insecure) */ custom_param("iommu", parse_iommu_param); bool_t __initdata iommu_enable = 1; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46: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 1ZfxIM-0006TN-PA; Sat, 26 Sep 2015 21:46:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIL-0006TB-AG for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:13 +0000 Content-Length: 5053 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id C4/E0-02380-42217065; Sat, 26 Sep 2015 21:46:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1443303970!22259560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4207 invoked from network); 26 Sep 2015 21:46:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxII-0003Fx-EL for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxII-00026m-Cd for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:10 +0000 Date: Sat, 26 Sep 2015 21:46:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Make p->policyvers be a local variable (ver) to shut up GCC 5.1.1 warnings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3974331017453996078==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3974331017453996078== Content-Length: 4721 Content-Transfer-Encoding: quoted-printable commit 6a2f81459e1455d65a9a6f78dd2a0d0278619680 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Sep 16 15:57:27 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Sep 22 12:09:03 2015 -0400 xen/xsm: Make p->policyvers be a local variable (ver) to shut up GCC 5.1.1 warnings. policydb.c: In function =E2=80=98user_read=E2=80=99: policydb.c:1443:26: error: =E2=80=98buf[2]=E2=80=99 may be used uninitialized in this function [-Werror=3Dmaybe-uninitialized] usrdatum->bounds =3D le32_to_cpu(buf[2]); ^ cc1: all warnings being treated as errors Which (as Andrew mentioned) is because GCC cannot assume that 'p->policyvers' has the same value between checks. We make it local, optimize the name to 'ver' and the warnings go away. We also update another call site with this modification to make it more inline with the rest of the functions. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Daniel De Graaf --- xen/xsm/flask/ss/policydb.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index a1060b1..eebfe9c 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -1258,6 +1258,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) int rc; __le32 buf[3]; u32 len; + u32 ver =3D p->policyvers; role =3D xzalloc(struct role_datum); if ( !role ) @@ -1266,7 +1267,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) goto out; } - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) rc =3D next_entry(buf, fp, sizeof(buf[0]) * 3); else rc =3D next_entry(buf, fp, sizeof(buf[0]) * 2); @@ -1276,7 +1277,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) len =3D le32_to_cpu(buf[0]); role->value =3D le32_to_cpu(buf[1]); - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) role->bounds =3D le32_to_cpu(buf[2]); key =3D xmalloc_array(char, len + 1); @@ -1328,6 +1329,7 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) int rc; __le32 buf[4]; u32 len; + u32 ver =3D p->policyvers; typdatum =3D xzalloc(struct type_datum); if ( !typdatum ) @@ -1336,7 +1338,7 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) return rc; } - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) rc =3D next_entry(buf, fp, sizeof(buf[0]) * 4); else rc =3D next_entry(buf, fp, sizeof(buf[0]) * 3); @@ -1346,7 +1348,7 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) len =3D le32_to_cpu(buf[0]); typdatum->value =3D le32_to_cpu(buf[1]); - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) { u32 prop =3D le32_to_cpu(buf[2]); @@ -1421,6 +1423,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) int rc; __le32 buf[3]; u32 len; + u32 ver =3D p->policyvers; usrdatum =3D xzalloc(struct user_datum); if ( !usrdatum ) @@ -1429,7 +1432,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) goto out; } - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) rc =3D next_entry(buf, fp, sizeof(buf[0]) * 3); else rc =3D next_entry(buf, fp, sizeof(buf[0]) * 2); @@ -1439,7 +1442,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) len =3D le32_to_cpu(buf[0]); usrdatum->value =3D le32_to_cpu(buf[1]); - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) usrdatum->bounds =3D le32_to_cpu(buf[2]); key =3D xmalloc_array(char, len + 1); @@ -1457,7 +1460,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) if ( rc ) goto bad; - if ( p->policyvers >=3D POLICYDB_VERSION_MLS ) + if ( ver >=3D POLICYDB_VERSION_MLS ) { rc =3D mls_read_range_helper(&usrdatum->range, fp); if ( rc ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3974331017453996078== 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 --===============3974331017453996078==-- From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46: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 1ZfxIM-0006TN-PA; Sat, 26 Sep 2015 21:46:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIL-0006TB-AG for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:13 +0000 Content-Length: 5053 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id C4/E0-02380-42217065; Sat, 26 Sep 2015 21:46:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1443303970!22259560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4207 invoked from network); 26 Sep 2015 21:46:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxII-0003Fx-EL for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxII-00026m-Cd for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:10 +0000 Date: Sat, 26 Sep 2015 21:46:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/xsm: Make p->policyvers be a local variable (ver) to shut up GCC 5.1.1 warnings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3974331017453996078==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3974331017453996078== Content-Length: 4721 Content-Transfer-Encoding: quoted-printable commit 6a2f81459e1455d65a9a6f78dd2a0d0278619680 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Sep 16 15:57:27 2015 -0400 Commit: Konrad Rzeszutek Wilk CommitDate: Tue Sep 22 12:09:03 2015 -0400 xen/xsm: Make p->policyvers be a local variable (ver) to shut up GCC 5.1.1 warnings. policydb.c: In function =E2=80=98user_read=E2=80=99: policydb.c:1443:26: error: =E2=80=98buf[2]=E2=80=99 may be used uninitialized in this function [-Werror=3Dmaybe-uninitialized] usrdatum->bounds =3D le32_to_cpu(buf[2]); ^ cc1: all warnings being treated as errors Which (as Andrew mentioned) is because GCC cannot assume that 'p->policyvers' has the same value between checks. We make it local, optimize the name to 'ver' and the warnings go away. We also update another call site with this modification to make it more inline with the rest of the functions. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Daniel De Graaf --- xen/xsm/flask/ss/policydb.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/xsm/flask/ss/policydb.c b/xen/xsm/flask/ss/policydb.c index a1060b1..eebfe9c 100644 --- a/xen/xsm/flask/ss/policydb.c +++ b/xen/xsm/flask/ss/policydb.c @@ -1258,6 +1258,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) int rc; __le32 buf[3]; u32 len; + u32 ver =3D p->policyvers; role =3D xzalloc(struct role_datum); if ( !role ) @@ -1266,7 +1267,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) goto out; } - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) rc =3D next_entry(buf, fp, sizeof(buf[0]) * 3); else rc =3D next_entry(buf, fp, sizeof(buf[0]) * 2); @@ -1276,7 +1277,7 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp) len =3D le32_to_cpu(buf[0]); role->value =3D le32_to_cpu(buf[1]); - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) role->bounds =3D le32_to_cpu(buf[2]); key =3D xmalloc_array(char, len + 1); @@ -1328,6 +1329,7 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) int rc; __le32 buf[4]; u32 len; + u32 ver =3D p->policyvers; typdatum =3D xzalloc(struct type_datum); if ( !typdatum ) @@ -1336,7 +1338,7 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) return rc; } - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) rc =3D next_entry(buf, fp, sizeof(buf[0]) * 4); else rc =3D next_entry(buf, fp, sizeof(buf[0]) * 3); @@ -1346,7 +1348,7 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp) len =3D le32_to_cpu(buf[0]); typdatum->value =3D le32_to_cpu(buf[1]); - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) { u32 prop =3D le32_to_cpu(buf[2]); @@ -1421,6 +1423,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) int rc; __le32 buf[3]; u32 len; + u32 ver =3D p->policyvers; usrdatum =3D xzalloc(struct user_datum); if ( !usrdatum ) @@ -1429,7 +1432,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) goto out; } - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) rc =3D next_entry(buf, fp, sizeof(buf[0]) * 3); else rc =3D next_entry(buf, fp, sizeof(buf[0]) * 2); @@ -1439,7 +1442,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) len =3D le32_to_cpu(buf[0]); usrdatum->value =3D le32_to_cpu(buf[1]); - if ( p->policyvers >=3D POLICYDB_VERSION_BOUNDARY ) + if ( ver >=3D POLICYDB_VERSION_BOUNDARY ) usrdatum->bounds =3D le32_to_cpu(buf[2]); key =3D xmalloc_array(char, len + 1); @@ -1457,7 +1460,7 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp) if ( rc ) goto bad; - if ( p->policyvers >=3D POLICYDB_VERSION_MLS ) + if ( ver >=3D POLICYDB_VERSION_MLS ) { rc =3D mls_read_range_helper(&usrdatum->range, fp); if ( rc ) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3974331017453996078== 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 --===============3974331017453996078==-- From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIW-0006VG-Te; Sat, 26 Sep 2015 21:46:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIV-0006V0-AZ for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:23 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 2D/FB-00536-E2217065; Sat, 26 Sep 2015 21:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1443303980!43496747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6235 invoked from network); 26 Sep 2015 21:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIS-0003G5-Js for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIS-00027f-Hv for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:20 +0000 Date: Sat, 26 Sep 2015 21:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: polish populate_physmap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4b6bbe2240f5d3b22245bee9f4ceb3698e78ef9 Author: Jan Beulich AuthorDate: Wed Sep 23 11:12:24 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:12:24 2015 +0200 memory: polish populate_physmap() Adjust types, avoid a NULL check for a case where it's not needed, and simplify setting a variable on the alternative path. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/memory.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index b541f4a1..f6aed0d 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -92,7 +92,7 @@ static void increase_reservation(struct memop_args *a) static void populate_physmap(struct memop_args *a) { struct page_info *page; - unsigned long i, j; + unsigned int i, j; xen_pfn_t gpfn, mfn; struct domain *d = a->domain; @@ -147,27 +147,31 @@ static void populate_physmap(struct memop_args *a) put_page(page); } - page = mfn_to_page(gpfn); + mfn = gpfn; + page = mfn_to_page(mfn); } else + { page = alloc_domheap_pages(d, a->extent_order, a->memflags); - if ( unlikely(page == NULL) ) - { - if ( !opt_tmem || (a->extent_order != 0) ) - gdprintk(XENLOG_INFO, "Could not allocate order=%d extent:" - " id=%d memflags=%x (%ld of %d)\n", - a->extent_order, d->domain_id, a->memflags, - i, a->nr_extents); - goto out; + if ( unlikely(!page) ) + { + if ( !opt_tmem || a->extent_order ) + gdprintk(XENLOG_INFO, + "Could not allocate order=%u extent: id=%d memflags=%#x (%u of %u)\n", + a->extent_order, d->domain_id, a->memflags, + i, a->nr_extents); + goto out; + } + + mfn = page_to_mfn(page); } - mfn = page_to_mfn(page); guest_physmap_add_page(d, gpfn, mfn, a->extent_order); if ( !paging_mode_translate(d) ) { - for ( j = 0; j < (1 << a->extent_order); j++ ) + for ( j = 0; j < (1U << a->extent_order); j++ ) set_gpfn_from_mfn(mfn + j, gpfn + j); /* Inform the domain of the new page's machine address. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIW-0006VG-Te; Sat, 26 Sep 2015 21:46:24 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIV-0006V0-AZ for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:23 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 2D/FB-00536-E2217065; Sat, 26 Sep 2015 21:46:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1443303980!43496747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6235 invoked from network); 26 Sep 2015 21:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:21 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIS-0003G5-Js for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIS-00027f-Hv for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:20 +0000 Date: Sat, 26 Sep 2015 21:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: polish populate_physmap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c4b6bbe2240f5d3b22245bee9f4ceb3698e78ef9 Author: Jan Beulich AuthorDate: Wed Sep 23 11:12:24 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:12:24 2015 +0200 memory: polish populate_physmap() Adjust types, avoid a NULL check for a case where it's not needed, and simplify setting a variable on the alternative path. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- xen/common/memory.c | 28 ++++++++++++++++------------ 1 files changed, 16 insertions(+), 12 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index b541f4a1..f6aed0d 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -92,7 +92,7 @@ static void increase_reservation(struct memop_args *a) static void populate_physmap(struct memop_args *a) { struct page_info *page; - unsigned long i, j; + unsigned int i, j; xen_pfn_t gpfn, mfn; struct domain *d = a->domain; @@ -147,27 +147,31 @@ static void populate_physmap(struct memop_args *a) put_page(page); } - page = mfn_to_page(gpfn); + mfn = gpfn; + page = mfn_to_page(mfn); } else + { page = alloc_domheap_pages(d, a->extent_order, a->memflags); - if ( unlikely(page == NULL) ) - { - if ( !opt_tmem || (a->extent_order != 0) ) - gdprintk(XENLOG_INFO, "Could not allocate order=%d extent:" - " id=%d memflags=%x (%ld of %d)\n", - a->extent_order, d->domain_id, a->memflags, - i, a->nr_extents); - goto out; + if ( unlikely(!page) ) + { + if ( !opt_tmem || a->extent_order ) + gdprintk(XENLOG_INFO, + "Could not allocate order=%u extent: id=%d memflags=%#x (%u of %u)\n", + a->extent_order, d->domain_id, a->memflags, + i, a->nr_extents); + goto out; + } + + mfn = page_to_mfn(page); } - mfn = page_to_mfn(page); guest_physmap_add_page(d, gpfn, mfn, a->extent_order); if ( !paging_mode_translate(d) ) { - for ( j = 0; j < (1 << a->extent_order); j++ ) + for ( j = 0; j < (1U << a->extent_order); j++ ) set_gpfn_from_mfn(mfn + j, gpfn + j); /* Inform the domain of the new page's machine address. */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46: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 1ZfxIg-0006ZG-W5; Sat, 26 Sep 2015 21:46:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIf-0006XH-Ag for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:33 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id D3/17-03819-83217065; Sat, 26 Sep 2015 21:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1443303990!5860503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20899 invoked from network); 26 Sep 2015 21:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIc-0003GD-OY for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIc-000287-Nj for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:30 +0000 Date: Sat, 26 Sep 2015 21:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: shorten debug key 'u' output X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11964811d7ace3e6cda2442d6f9898688c282692 Author: Jan Beulich AuthorDate: Wed Sep 23 11:13:21 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:13:21 2015 +0200 x86: shorten debug key 'u' output ... by grouping sequences of contiguous CPUs. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/numa.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 132d694..3041b24 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -365,7 +365,7 @@ EXPORT_SYMBOL(node_data); static void dump_numa(unsigned char key) { s_time_t now = NOW(); - unsigned int i, j; + unsigned int i, j, n; int err; struct domain *d; struct page_info *page; @@ -389,8 +389,26 @@ static void dump_numa(unsigned char key) NODE_DATA(i)->node_id); } + j = cpumask_first(&cpu_online_map); + n = 0; for_each_online_cpu ( i ) - printk("CPU%d -> NODE%d\n", i, cpu_to_node[i]); + { + if ( i != j + n || cpu_to_node[j] != cpu_to_node[i] ) + { + if ( n > 1 ) + printk("CPU%u...%u -> NODE%d\n", j, j + n - 1, cpu_to_node[j]); + else + printk("CPU%u -> NODE%d\n", j, cpu_to_node[j]); + j = i; + n = 1; + } + else + ++n; + } + if ( n > 1 ) + printk("CPU%u...%u -> NODE%d\n", j, j + n - 1, cpu_to_node[j]); + else + printk("CPU%u -> NODE%d\n", j, cpu_to_node[j]); rcu_read_lock(&domlist_read_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46: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 1ZfxIg-0006ZG-W5; Sat, 26 Sep 2015 21:46:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIf-0006XH-Ag for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:33 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id D3/17-03819-83217065; Sat, 26 Sep 2015 21:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1443303990!5860503!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20899 invoked from network); 26 Sep 2015 21:46:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:31 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIc-0003GD-OY for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIc-000287-Nj for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:30 +0000 Date: Sat, 26 Sep 2015 21:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: shorten debug key 'u' output X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11964811d7ace3e6cda2442d6f9898688c282692 Author: Jan Beulich AuthorDate: Wed Sep 23 11:13:21 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:13:21 2015 +0200 x86: shorten debug key 'u' output ... by grouping sequences of contiguous CPUs. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/numa.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 132d694..3041b24 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -365,7 +365,7 @@ EXPORT_SYMBOL(node_data); static void dump_numa(unsigned char key) { s_time_t now = NOW(); - unsigned int i, j; + unsigned int i, j, n; int err; struct domain *d; struct page_info *page; @@ -389,8 +389,26 @@ static void dump_numa(unsigned char key) NODE_DATA(i)->node_id); } + j = cpumask_first(&cpu_online_map); + n = 0; for_each_online_cpu ( i ) - printk("CPU%d -> NODE%d\n", i, cpu_to_node[i]); + { + if ( i != j + n || cpu_to_node[j] != cpu_to_node[i] ) + { + if ( n > 1 ) + printk("CPU%u...%u -> NODE%d\n", j, j + n - 1, cpu_to_node[j]); + else + printk("CPU%u -> NODE%d\n", j, cpu_to_node[j]); + j = i; + n = 1; + } + else + ++n; + } + if ( n > 1 ) + printk("CPU%u...%u -> NODE%d\n", j, j + n - 1, cpu_to_node[j]); + else + printk("CPU%u -> NODE%d\n", j, cpu_to_node[j]); rcu_read_lock(&domlist_read_lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIs-0006dQ-2L; Sat, 26 Sep 2015 21:46:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIq-0006cC-9Y for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:44 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 8F/8B-28791-34217065; Sat, 26 Sep 2015 21:46:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1443304001!41889147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26119 invoked from network); 26 Sep 2015 21:46:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIm-0003GL-TE for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIm-00028W-Rf for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:40 +0000 Date: Sat, 26 Sep 2015 21:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: add PoD accounting to set_typed_p2m_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 11d49fffb2cad84403d807200be3085d653c854c Author: Jan Beulich AuthorDate: Wed Sep 23 11:14:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:14:05 2015 +0200 x86/p2m: add PoD accounting to set_typed_p2m_entry() While neither PoD together with pass-through nor PVH are currently supported we still shouldn't leave in place such latent issues. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/arch/x86/mm/p2m.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e1d930a..87b6a16 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -926,11 +926,19 @@ static int set_typed_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, P2M_DEBUG("set %d %lx %lx\n", gfn_p2mt, gfn, mfn_x(mfn)); rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, gfn_p2mt, access); - gfn_unlock(p2m, gfn, 0); if ( rc ) gdprintk(XENLOG_ERR, "p2m_set_entry failed! mfn=%08lx rc:%d\n", mfn_x(get_gfn_query_unlocked(p2m->domain, gfn, &ot)), rc); + else if ( p2m_is_pod(ot) ) + { + pod_lock(p2m); + p2m->pod.entry_count--; + BUG_ON(p2m->pod.entry_count < 0); + pod_unlock(p2m); + } + gfn_unlock(p2m, gfn, 0); + return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIs-0006dQ-2L; Sat, 26 Sep 2015 21:46:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIq-0006cC-9Y for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:44 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 8F/8B-28791-34217065; Sat, 26 Sep 2015 21:46:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1443304001!41889147!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26119 invoked from network); 26 Sep 2015 21:46:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:46:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIm-0003GL-TE for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIm-00028W-Rf for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:40 +0000 Date: Sat, 26 Sep 2015 21:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: add PoD accounting to set_typed_p2m_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 11d49fffb2cad84403d807200be3085d653c854c Author: Jan Beulich AuthorDate: Wed Sep 23 11:14:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:14:05 2015 +0200 x86/p2m: add PoD accounting to set_typed_p2m_entry() While neither PoD together with pass-through nor PVH are currently supported we still shouldn't leave in place such latent issues. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper Acked-by: George Dunlap --- xen/arch/x86/mm/p2m.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index e1d930a..87b6a16 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -926,11 +926,19 @@ static int set_typed_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn, P2M_DEBUG("set %d %lx %lx\n", gfn_p2mt, gfn, mfn_x(mfn)); rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, gfn_p2mt, access); - gfn_unlock(p2m, gfn, 0); if ( rc ) gdprintk(XENLOG_ERR, "p2m_set_entry failed! mfn=%08lx rc:%d\n", mfn_x(get_gfn_query_unlocked(p2m->domain, gfn, &ot)), rc); + else if ( p2m_is_pod(ot) ) + { + pod_lock(p2m); + p2m->pod.entry_count--; + BUG_ON(p2m->pod.entry_count < 0); + pod_unlock(p2m); + } + gfn_unlock(p2m, gfn, 0); + return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJ1-0006gJ-4t; Sat, 26 Sep 2015 21:46:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIz-0006g7-Ra for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:54 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 85/40-06179-D4217065; Sat, 26 Sep 2015 21:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1443304011!33871063!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7164 invoked from network); 26 Sep 2015 21:46:52 -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; 26 Sep 2015 21:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIx-0003GT-3R for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIx-00028z-1T for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:51 +0000 Date: Sat, 26 Sep 2015 21:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: record xsave features in c->x86_capabilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c421a12ea1ae6a7d249a013e9b7e17b2e603d66 Author: Andrew Cooper AuthorDate: Wed Sep 23 11:15:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:15:05 2015 +0200 x86: record xsave features in c->x86_capabilities Convert existing cpu_has_x??? to being functions of boot_cpu_data (matching the prevailing style), and mask out unsupported features. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/traps.c | 5 +---- xen/arch/x86/xstate.c | 30 ++++++++++-------------------- xen/include/asm-x86/cpufeature.h | 11 ++++++++++- xen/include/asm-x86/xstate.h | 8 ++------ 5 files changed, 24 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 35ef21b..0be0656 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -311,7 +311,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(c == &boot_cpu_data); + xstate_init(c); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9f5a6c6..07feb6d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -935,10 +935,7 @@ void pv_cpuid(struct cpu_user_regs *regs) goto unsupported; if ( regs->_ecx == 1 ) { - a &= XSTATE_FEATURE_XSAVEOPT | - XSTATE_FEATURE_XSAVEC | - (cpu_has_xgetbv1 ? XSTATE_FEATURE_XGETBV1 : 0) | - (cpu_has_xsaves ? XSTATE_FEATURE_XSAVES : 0); + a &= boot_cpu_data.x86_capability[X86_FEATURE_XSAVEOPT / 32]; if ( !cpu_has_xsaves ) b = c = d = 0; } diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index d5f5e3b..9ddff90 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -14,11 +14,6 @@ #include #include -static bool_t __read_mostly cpu_has_xsaveopt; -static bool_t __read_mostly cpu_has_xsavec; -bool_t __read_mostly cpu_has_xgetbv1; -bool_t __read_mostly cpu_has_xsaves; - /* * Maximum size (in byte) of the XSAVE/XRSTOR save area required by all * the supported and enabled features on the processor, including the @@ -281,8 +276,9 @@ unsigned int xstate_ctxt_size(u64 xcr0) } /* Collect the information of processor's extended state */ -void xstate_init(bool_t bsp) +void xstate_init(struct cpuinfo_x86 *c) { + bool_t bsp = c == &boot_cpu_data; u32 eax, ebx, ecx, edx; u64 feature_mask; @@ -325,20 +321,14 @@ void xstate_init(bool_t bsp) /* Check extended XSAVE features. */ cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - if ( bsp ) - { - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); - cpu_has_xsavec = !!(eax & XSTATE_FEATURE_XSAVEC); - /* XXX cpu_has_xgetbv1 = !!(eax & XSTATE_FEATURE_XGETBV1); */ - /* XXX cpu_has_xsaves = !!(eax & XSTATE_FEATURE_XSAVES); */ - } - else - { - BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); - BUG_ON(!cpu_has_xsavec != !(eax & XSTATE_FEATURE_XSAVEC)); - /* XXX BUG_ON(!cpu_has_xgetbv1 != !(eax & XSTATE_FEATURE_XGETBV1)); */ - /* XXX BUG_ON(!cpu_has_xsaves != !(eax & XSTATE_FEATURE_XSAVES)); */ - } + + /* Mask out features not currently understood by Xen. */ + eax &= (cpufeat_mask(X86_FEATURE_XSAVEOPT) | + cpufeat_mask(X86_FEATURE_XSAVEC)); + + c->x86_capability[X86_FEATURE_XSAVEOPT / 32] = eax; + + BUG_ON(eax != boot_cpu_data.x86_capability[X86_FEATURE_XSAVEOPT / 32]); } static bool_t valid_xcr0(u64 xcr0) diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 9a01563..6a94724 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -57,7 +57,11 @@ #define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */ #define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */ -/* *** Available for re-use ***, word 2 */ +/* Intel-defined CPU features, CPUID level 0x0000000D:1 (eax), word 2 */ +#define X86_FEATURE_XSAVEOPT (2*32+ 0) /* XSAVEOPT instruction. */ +#define X86_FEATURE_XSAVEC (2*32+ 1) /* XSAVEC/XRSTORC instructions. */ +#define X86_FEATURE_XGETBV1 (2*32+ 2) /* XGETBV with %ecx=1. */ +#define X86_FEATURE_XSAVES (2*32+ 3) /* XSAVES/XRSTORS instructions. */ /* Other features, Linux-defined mapping, word 3 */ /* This range is used for feature bits which conflict or are synthesized */ @@ -219,6 +223,11 @@ #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16) +#define cpu_has_xsaveopt boot_cpu_has(X86_FEATURE_XSAVEOPT) +#define cpu_has_xsavec boot_cpu_has(X86_FEATURE_XSAVEC) +#define cpu_has_xgetbv1 boot_cpu_has(X86_FEATURE_XGETBV1) +#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) + enum _cache_type { CACHE_TYPE_NULL = 0, CACHE_TYPE_DATA = 1, diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 4c690db..f0d8f0b 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -9,16 +9,13 @@ #define __ASM_XSTATE_H #include +#include #define FCW_DEFAULT 0x037f #define FCW_RESET 0x0040 #define MXCSR_DEFAULT 0x1f80 #define XSTATE_CPUID 0x0000000d -#define XSTATE_FEATURE_XSAVEOPT (1 << 0) /* sub-leaf 1, eax[bit 0] */ -#define XSTATE_FEATURE_XSAVEC (1 << 1) /* sub-leaf 1, eax[bit 1] */ -#define XSTATE_FEATURE_XGETBV1 (1 << 2) /* sub-leaf 1, eax[bit 2] */ -#define XSTATE_FEATURE_XSAVES (1 << 3) /* sub-leaf 1, eax[bit 3] */ #define XCR_XFEATURE_ENABLED_MASK 0x00000000 /* index of XCR0 */ @@ -43,7 +40,6 @@ #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) extern u64 xfeature_mask; -extern bool_t cpu_has_xsaves, cpu_has_xgetbv1; /* extended state save area */ struct __packed __attribute__((aligned (64))) xsave_struct @@ -91,7 +87,7 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(bool_t bsp); +void xstate_init(struct cpuinfo_x86 *c); unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:46:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:46:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJ1-0006gJ-4t; Sat, 26 Sep 2015 21:46:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIz-0006g7-Ra for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:54 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 85/40-06179-D4217065; Sat, 26 Sep 2015 21:46:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1443304011!33871063!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7164 invoked from network); 26 Sep 2015 21:46:52 -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; 26 Sep 2015 21:46:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxIx-0003GT-3R for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxIx-00028z-1T for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:46:51 +0000 Date: Sat, 26 Sep 2015 21:46:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: record xsave features in c->x86_capabilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c421a12ea1ae6a7d249a013e9b7e17b2e603d66 Author: Andrew Cooper AuthorDate: Wed Sep 23 11:15:05 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:15:05 2015 +0200 x86: record xsave features in c->x86_capabilities Convert existing cpu_has_x??? to being functions of boot_cpu_data (matching the prevailing style), and mask out unsupported features. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 2 +- xen/arch/x86/traps.c | 5 +---- xen/arch/x86/xstate.c | 30 ++++++++++-------------------- xen/include/asm-x86/cpufeature.h | 11 ++++++++++- xen/include/asm-x86/xstate.h | 8 ++------ 5 files changed, 24 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 35ef21b..0be0656 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -311,7 +311,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) clear_bit(X86_FEATURE_XSAVE, boot_cpu_data.x86_capability); if ( cpu_has_xsave ) - xstate_init(c == &boot_cpu_data); + xstate_init(c); /* * The vendor-specific functions might have changed features. Now diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 9f5a6c6..07feb6d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -935,10 +935,7 @@ void pv_cpuid(struct cpu_user_regs *regs) goto unsupported; if ( regs->_ecx == 1 ) { - a &= XSTATE_FEATURE_XSAVEOPT | - XSTATE_FEATURE_XSAVEC | - (cpu_has_xgetbv1 ? XSTATE_FEATURE_XGETBV1 : 0) | - (cpu_has_xsaves ? XSTATE_FEATURE_XSAVES : 0); + a &= boot_cpu_data.x86_capability[X86_FEATURE_XSAVEOPT / 32]; if ( !cpu_has_xsaves ) b = c = d = 0; } diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index d5f5e3b..9ddff90 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -14,11 +14,6 @@ #include #include -static bool_t __read_mostly cpu_has_xsaveopt; -static bool_t __read_mostly cpu_has_xsavec; -bool_t __read_mostly cpu_has_xgetbv1; -bool_t __read_mostly cpu_has_xsaves; - /* * Maximum size (in byte) of the XSAVE/XRSTOR save area required by all * the supported and enabled features on the processor, including the @@ -281,8 +276,9 @@ unsigned int xstate_ctxt_size(u64 xcr0) } /* Collect the information of processor's extended state */ -void xstate_init(bool_t bsp) +void xstate_init(struct cpuinfo_x86 *c) { + bool_t bsp = c == &boot_cpu_data; u32 eax, ebx, ecx, edx; u64 feature_mask; @@ -325,20 +321,14 @@ void xstate_init(bool_t bsp) /* Check extended XSAVE features. */ cpuid_count(XSTATE_CPUID, 1, &eax, &ebx, &ecx, &edx); - if ( bsp ) - { - cpu_has_xsaveopt = !!(eax & XSTATE_FEATURE_XSAVEOPT); - cpu_has_xsavec = !!(eax & XSTATE_FEATURE_XSAVEC); - /* XXX cpu_has_xgetbv1 = !!(eax & XSTATE_FEATURE_XGETBV1); */ - /* XXX cpu_has_xsaves = !!(eax & XSTATE_FEATURE_XSAVES); */ - } - else - { - BUG_ON(!cpu_has_xsaveopt != !(eax & XSTATE_FEATURE_XSAVEOPT)); - BUG_ON(!cpu_has_xsavec != !(eax & XSTATE_FEATURE_XSAVEC)); - /* XXX BUG_ON(!cpu_has_xgetbv1 != !(eax & XSTATE_FEATURE_XGETBV1)); */ - /* XXX BUG_ON(!cpu_has_xsaves != !(eax & XSTATE_FEATURE_XSAVES)); */ - } + + /* Mask out features not currently understood by Xen. */ + eax &= (cpufeat_mask(X86_FEATURE_XSAVEOPT) | + cpufeat_mask(X86_FEATURE_XSAVEC)); + + c->x86_capability[X86_FEATURE_XSAVEOPT / 32] = eax; + + BUG_ON(eax != boot_cpu_data.x86_capability[X86_FEATURE_XSAVEOPT / 32]); } static bool_t valid_xcr0(u64 xcr0) diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 9a01563..6a94724 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -57,7 +57,11 @@ #define X86_FEATURE_3DNOWEXT (1*32+30) /* AMD 3DNow! extensions */ #define X86_FEATURE_3DNOW (1*32+31) /* 3DNow! */ -/* *** Available for re-use ***, word 2 */ +/* Intel-defined CPU features, CPUID level 0x0000000D:1 (eax), word 2 */ +#define X86_FEATURE_XSAVEOPT (2*32+ 0) /* XSAVEOPT instruction. */ +#define X86_FEATURE_XSAVEC (2*32+ 1) /* XSAVEC/XRSTORC instructions. */ +#define X86_FEATURE_XGETBV1 (2*32+ 2) /* XGETBV with %ecx=1. */ +#define X86_FEATURE_XSAVES (2*32+ 3) /* XSAVES/XRSTORS instructions. */ /* Other features, Linux-defined mapping, word 3 */ /* This range is used for feature bits which conflict or are synthesized */ @@ -219,6 +223,11 @@ #define cpu_has_cx16 boot_cpu_has(X86_FEATURE_CX16) +#define cpu_has_xsaveopt boot_cpu_has(X86_FEATURE_XSAVEOPT) +#define cpu_has_xsavec boot_cpu_has(X86_FEATURE_XSAVEC) +#define cpu_has_xgetbv1 boot_cpu_has(X86_FEATURE_XGETBV1) +#define cpu_has_xsaves boot_cpu_has(X86_FEATURE_XSAVES) + enum _cache_type { CACHE_TYPE_NULL = 0, CACHE_TYPE_DATA = 1, diff --git a/xen/include/asm-x86/xstate.h b/xen/include/asm-x86/xstate.h index 4c690db..f0d8f0b 100644 --- a/xen/include/asm-x86/xstate.h +++ b/xen/include/asm-x86/xstate.h @@ -9,16 +9,13 @@ #define __ASM_XSTATE_H #include +#include #define FCW_DEFAULT 0x037f #define FCW_RESET 0x0040 #define MXCSR_DEFAULT 0x1f80 #define XSTATE_CPUID 0x0000000d -#define XSTATE_FEATURE_XSAVEOPT (1 << 0) /* sub-leaf 1, eax[bit 0] */ -#define XSTATE_FEATURE_XSAVEC (1 << 1) /* sub-leaf 1, eax[bit 1] */ -#define XSTATE_FEATURE_XGETBV1 (1 << 2) /* sub-leaf 1, eax[bit 2] */ -#define XSTATE_FEATURE_XSAVES (1 << 3) /* sub-leaf 1, eax[bit 3] */ #define XCR_XFEATURE_ENABLED_MASK 0x00000000 /* index of XCR0 */ @@ -43,7 +40,6 @@ #define XSTATE_LAZY (XSTATE_ALL & ~XSTATE_NONLAZY) extern u64 xfeature_mask; -extern bool_t cpu_has_xsaves, cpu_has_xgetbv1; /* extended state save area */ struct __packed __attribute__((aligned (64))) xsave_struct @@ -91,7 +87,7 @@ int __must_check handle_xsetbv(u32 index, u64 new_bv); /* extended state init and cleanup functions */ void xstate_free_save_area(struct vcpu *v); int xstate_alloc_save_area(struct vcpu *v); -void xstate_init(bool_t bsp); +void xstate_init(struct cpuinfo_x86 *c); unsigned int xstate_ctxt_size(u64 xcr0); #endif /* __ASM_XSTATE_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:47:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:47: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 1ZfxJE-0006tG-7i; Sat, 26 Sep 2015 21:47:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJC-0006rh-Vz for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:07 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 24/BB-32110-A5217065; Sat, 26 Sep 2015 21:47:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1443304024!35107321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15441 invoked from network); 26 Sep 2015 21:47:05 -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; 26 Sep 2015 21:47:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJ7-0003Gb-7j for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxJ7-00029M-6m for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:01 +0000 Date: Sat, 26 Sep 2015 21:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: refine hap_has_{2mb, 1gb} checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4db520bcf75a101ce7e06cdca52350c100a8e67e Author: Andrew Cooper AuthorDate: Wed Sep 23 11:16:08 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:16:08 2015 +0200 x86/hvm: refine hap_has_{2mb,1gb} checks HAP superpages are a host property and not dependent on domain configuration. Drop the domain paramter (which was only used in one of the two callsites), and drop the redundant hvm_ prefix to mirror the cpu_has_* style of feature detection. Finally, convert the checks to being proper booleans rather than just non-zero integers. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: George Dunlap --- xen/arch/x86/mm/p2m-ept.c | 4 ++-- xen/arch/x86/mm/p2m.c | 4 ++-- xen/include/asm-x86/hvm/hvm.h | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 58db34e..dde242e 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -696,8 +696,8 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, if ( ret > 0 ) needs_sync = sync_on; - ASSERT((target == 2 && hvm_hap_has_1gb()) || - (target == 1 && hvm_hap_has_2mb()) || + ASSERT((target == 2 && hap_has_1gb) || + (target == 1 && hap_has_2mb) || (target == 0)); ASSERT(!p2m_is_foreign(p2mt) || target == 0); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 87b6a16..1eda2c8 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -452,9 +452,9 @@ int p2m_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, { if ( hap_enabled(d) ) order = ( (((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_1G) - 1)) == 0) && - hvm_hap_has_1gb(d) && opt_hap_1gb ) ? PAGE_ORDER_1G : + hap_has_1gb && opt_hap_1gb) ? PAGE_ORDER_1G : ((((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_2M) - 1)) == 0) && - hvm_hap_has_2mb(d) && opt_hap_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; + hap_has_2mb && opt_hap_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; else order = 0; diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 9f49e6d..0693706 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -278,10 +278,8 @@ int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest, uint8_t dest_mode); (!!((v)->arch.hvm_vcpu.guest_efer & EFER_NX)) /* Can we use superpages in the HAP p2m table? */ -#define hvm_hap_has_1gb(d) \ - (hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB) -#define hvm_hap_has_2mb(d) \ - (hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_2MB) +#define hap_has_1gb (!!(hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB)) +#define hap_has_2mb (!!(hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_2MB)) /* Can the guest use 1GB superpages in its own pagetables? */ #define hvm_pse1gb_supported(d) \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:47:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:47: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 1ZfxJE-0006tG-7i; Sat, 26 Sep 2015 21:47:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJC-0006rh-Vz for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:07 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 24/BB-32110-A5217065; Sat, 26 Sep 2015 21:47:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1443304024!35107321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15441 invoked from network); 26 Sep 2015 21:47:05 -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; 26 Sep 2015 21:47:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJ7-0003Gb-7j for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxJ7-00029M-6m for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:01 +0000 Date: Sat, 26 Sep 2015 21:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: refine hap_has_{2mb, 1gb} checks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4db520bcf75a101ce7e06cdca52350c100a8e67e Author: Andrew Cooper AuthorDate: Wed Sep 23 11:16:08 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:16:08 2015 +0200 x86/hvm: refine hap_has_{2mb,1gb} checks HAP superpages are a host property and not dependent on domain configuration. Drop the domain paramter (which was only used in one of the two callsites), and drop the redundant hvm_ prefix to mirror the cpu_has_* style of feature detection. Finally, convert the checks to being proper booleans rather than just non-zero integers. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: George Dunlap --- xen/arch/x86/mm/p2m-ept.c | 4 ++-- xen/arch/x86/mm/p2m.c | 4 ++-- xen/include/asm-x86/hvm/hvm.h | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 58db34e..dde242e 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -696,8 +696,8 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, if ( ret > 0 ) needs_sync = sync_on; - ASSERT((target == 2 && hvm_hap_has_1gb()) || - (target == 1 && hvm_hap_has_2mb()) || + ASSERT((target == 2 && hap_has_1gb) || + (target == 1 && hap_has_2mb) || (target == 0)); ASSERT(!p2m_is_foreign(p2mt) || target == 0); diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 87b6a16..1eda2c8 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -452,9 +452,9 @@ int p2m_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, { if ( hap_enabled(d) ) order = ( (((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_1G) - 1)) == 0) && - hvm_hap_has_1gb(d) && opt_hap_1gb ) ? PAGE_ORDER_1G : + hap_has_1gb && opt_hap_1gb) ? PAGE_ORDER_1G : ((((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_2M) - 1)) == 0) && - hvm_hap_has_2mb(d) && opt_hap_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; + hap_has_2mb && opt_hap_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; else order = 0; diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 9f49e6d..0693706 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -278,10 +278,8 @@ int hvm_girq_dest_2_vcpu_id(struct domain *d, uint8_t dest, uint8_t dest_mode); (!!((v)->arch.hvm_vcpu.guest_efer & EFER_NX)) /* Can we use superpages in the HAP p2m table? */ -#define hvm_hap_has_1gb(d) \ - (hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB) -#define hvm_hap_has_2mb(d) \ - (hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_2MB) +#define hap_has_1gb (!!(hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_1GB)) +#define hap_has_2mb (!!(hvm_funcs.hap_capabilities & HVM_HAP_SUPERPAGE_2MB)) /* Can the guest use 1GB superpages in its own pagetables? */ #define hvm_pse1gb_supported(d) \ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:47:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:47:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJM-00075X-Ai; Sat, 26 Sep 2015 21:47:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJK-00071a-IU for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:14 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 84/EF-12889-16217065; Sat, 26 Sep 2015 21:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1443304031!53295762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3848 invoked from network); 26 Sep 2015 21:47:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJH-0003HD-CF for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxJH-00029r-BA for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:11 +0000 Date: Sat, 26 Sep 2015 21:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fold opt_hap_{2mb, 1gb} into hap_capabilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cc1346f1c578050d274133dc777000247adfc11 Author: Andrew Cooper AuthorDate: Wed Sep 23 11:16:51 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:16:51 2015 +0200 x86/hvm: fold opt_hap_{2mb,1gb} into hap_capabilities This allows all runtime users to simply check hap_has_{2mb,1gb} rather than having to check opt_hap_{2mb,1gb} as well. As a result, opt_hap_{2mb,1gb} can move into __initdata. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: George Dunlap --- xen/arch/x86/hvm/hvm.c | 8 ++++++++ xen/arch/x86/mm/p2m.c | 17 ++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f082b86..6afc344 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -158,9 +158,17 @@ static int __init hvm_enable(void) printk("HVM: Hardware Assisted Paging (HAP) detected\n"); printk("HVM: HAP page sizes: 4kB"); if ( fns->hap_capabilities & HVM_HAP_SUPERPAGE_2MB ) + { printk(", 2MB%s", opt_hap_2mb ? "" : " [disabled]"); + if ( !opt_hap_2mb ) + hvm_funcs.hap_capabilities &= ~HVM_HAP_SUPERPAGE_2MB; + } if ( fns->hap_capabilities & HVM_HAP_SUPERPAGE_1GB ) + { printk(", 1GB%s", opt_hap_1gb ? "" : " [disabled]"); + if ( !opt_hap_1gb ) + hvm_funcs.hap_capabilities &= ~HVM_HAP_SUPERPAGE_1GB; + } printk("\n"); } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1eda2c8..cf8485e 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -41,14 +41,11 @@ #include "mm-locks.h" -/* turn on/off 1GB host page table support for hap, default on */ -bool_t __read_mostly opt_hap_1gb = 1; +/* Turn on/off host superpage page table support for hap, default on. */ +bool_t __initdata opt_hap_1gb = 1, __initdata opt_hap_2mb = 1; boolean_param("hap_1gb", opt_hap_1gb); - -bool_t __read_mostly opt_hap_2mb = 1; boolean_param("hap_2mb", opt_hap_2mb); - /* Override macros from asm/page.h to make them work with mfn_t */ #undef mfn_to_page #define mfn_to_page(_m) __mfn_to_page(mfn_x(_m)) @@ -451,10 +448,12 @@ int p2m_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, while ( todo ) { if ( hap_enabled(d) ) - order = ( (((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_1G) - 1)) == 0) && - hap_has_1gb && opt_hap_1gb) ? PAGE_ORDER_1G : - ((((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_2M) - 1)) == 0) && - hap_has_2mb && opt_hap_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; + order = (!((gfn | mfn_x(mfn) | todo) & + ((1ul << PAGE_ORDER_1G) - 1)) && + hap_has_1gb) ? PAGE_ORDER_1G : + (!((gfn | mfn_x(mfn) | todo) & + ((1ul << PAGE_ORDER_2M) - 1)) && + hap_has_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; else order = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Sep 26 21:47:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 26 Sep 2015 21:47:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJM-00075X-Ai; Sat, 26 Sep 2015 21:47:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJK-00071a-IU for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:14 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 84/EF-12889-16217065; Sat, 26 Sep 2015 21:47:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1443304031!53295762!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3848 invoked from network); 26 Sep 2015 21:47:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2015 21:47:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfxJH-0003HD-CF for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZfxJH-00029r-BA for xen-changelog@lists.xensource.com; Sat, 26 Sep 2015 21:47:11 +0000 Date: Sat, 26 Sep 2015 21:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fold opt_hap_{2mb, 1gb} into hap_capabilities X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9cc1346f1c578050d274133dc777000247adfc11 Author: Andrew Cooper AuthorDate: Wed Sep 23 11:16:51 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 23 11:16:51 2015 +0200 x86/hvm: fold opt_hap_{2mb,1gb} into hap_capabilities This allows all runtime users to simply check hap_has_{2mb,1gb} rather than having to check opt_hap_{2mb,1gb} as well. As a result, opt_hap_{2mb,1gb} can move into __initdata. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: George Dunlap --- xen/arch/x86/hvm/hvm.c | 8 ++++++++ xen/arch/x86/mm/p2m.c | 17 ++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index f082b86..6afc344 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -158,9 +158,17 @@ static int __init hvm_enable(void) printk("HVM: Hardware Assisted Paging (HAP) detected\n"); printk("HVM: HAP page sizes: 4kB"); if ( fns->hap_capabilities & HVM_HAP_SUPERPAGE_2MB ) + { printk(", 2MB%s", opt_hap_2mb ? "" : " [disabled]"); + if ( !opt_hap_2mb ) + hvm_funcs.hap_capabilities &= ~HVM_HAP_SUPERPAGE_2MB; + } if ( fns->hap_capabilities & HVM_HAP_SUPERPAGE_1GB ) + { printk(", 1GB%s", opt_hap_1gb ? "" : " [disabled]"); + if ( !opt_hap_1gb ) + hvm_funcs.hap_capabilities &= ~HVM_HAP_SUPERPAGE_1GB; + } printk("\n"); } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 1eda2c8..cf8485e 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -41,14 +41,11 @@ #include "mm-locks.h" -/* turn on/off 1GB host page table support for hap, default on */ -bool_t __read_mostly opt_hap_1gb = 1; +/* Turn on/off host superpage page table support for hap, default on. */ +bool_t __initdata opt_hap_1gb = 1, __initdata opt_hap_2mb = 1; boolean_param("hap_1gb", opt_hap_1gb); - -bool_t __read_mostly opt_hap_2mb = 1; boolean_param("hap_2mb", opt_hap_2mb); - /* Override macros from asm/page.h to make them work with mfn_t */ #undef mfn_to_page #define mfn_to_page(_m) __mfn_to_page(mfn_x(_m)) @@ -451,10 +448,12 @@ int p2m_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, while ( todo ) { if ( hap_enabled(d) ) - order = ( (((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_1G) - 1)) == 0) && - hap_has_1gb && opt_hap_1gb) ? PAGE_ORDER_1G : - ((((gfn | mfn_x(mfn) | todo) & ((1ul << PAGE_ORDER_2M) - 1)) == 0) && - hap_has_2mb && opt_hap_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; + order = (!((gfn | mfn_x(mfn) | todo) & + ((1ul << PAGE_ORDER_1G) - 1)) && + hap_has_1gb) ? PAGE_ORDER_1G : + (!((gfn | mfn_x(mfn) | todo) & + ((1ul << PAGE_ORDER_2M) - 1)) && + hap_has_2mb) ? PAGE_ORDER_2M : PAGE_ORDER_4K; else order = 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 27 19:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 27 Sep 2015 19:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgHWU-00052W-7b; Sun, 27 Sep 2015 19:22:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgHWT-00052R-KG for xen-changelog@lists.xensource.com; Sun, 27 Sep 2015 19:22:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id BC/92-19220-0E148065; Sun, 27 Sep 2015 19:22:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1443381725!14596930!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4483 invoked from network); 27 Sep 2015 19:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2015 19:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgHWM-0006hc-L3 for xen-changelog@lists.xensource.com; Sun, 27 Sep 2015 19:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgHWM-0005Qk-IP for xen-changelog@lists.xensource.com; Sun, 27 Sep 2015 19:22:02 +0000 Date: Sun, 27 Sep 2015 19:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: handle read-only drives with qemu-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 e4f09370f24a2226125659973655b9bae384f903 Author: Stefano Stabellini AuthorDate: Tue Sep 22 16:56:35 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 22 17:03:04 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Backport to Xen 4.5 and earlier, apropos of report and review from Michael Young. Signed-off-by: Ian Jackson (cherry picked from commit 998424e33db121270690586320e899a03c88b4aa) (Backport to 4.2 and earlier.) Conflicts: tools/libxl/libxl_dm.c Signed-off-by: Ian Jackson --- tools/libxl/libxl_dm.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 6a1b91f..ea2ba01 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -574,12 +574,18 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback", disk); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback", + disk, disks[i].readwrite ? "off" : "on"); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return NULL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- 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 Sep 27 19:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 27 Sep 2015 19:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgHWU-00052W-7b; Sun, 27 Sep 2015 19:22:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgHWT-00052R-KG for xen-changelog@lists.xensource.com; Sun, 27 Sep 2015 19:22:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id BC/92-19220-0E148065; Sun, 27 Sep 2015 19:22:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1443381725!14596930!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4483 invoked from network); 27 Sep 2015 19:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 27 Sep 2015 19:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgHWM-0006hc-L3 for xen-changelog@lists.xensource.com; Sun, 27 Sep 2015 19:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgHWM-0005Qk-IP for xen-changelog@lists.xensource.com; Sun, 27 Sep 2015 19:22:02 +0000 Date: Sun, 27 Sep 2015 19:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] libxl: handle read-only drives with qemu-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 e4f09370f24a2226125659973655b9bae384f903 Author: Stefano Stabellini AuthorDate: Tue Sep 22 16:56:35 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 22 17:03:04 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Backport to Xen 4.5 and earlier, apropos of report and review from Michael Young. Signed-off-by: Ian Jackson (cherry picked from commit 998424e33db121270690586320e899a03c88b4aa) (Backport to 4.2 and earlier.) Conflicts: tools/libxl/libxl_dm.c Signed-off-by: Ian Jackson --- tools/libxl/libxl_dm.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 6a1b91f..ea2ba01 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -574,12 +574,18 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback", disk); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback", + disk, disks[i].readwrite ? "off" : "on"); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return NULL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04: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 1ZgQIK-0005jM-4W; Mon, 28 Sep 2015 04:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQII-0005jH-Tu for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:07 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 5E/E1-13905-695C8065; Mon, 28 Sep 2015 04:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1443415444!38098914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19227 invoked from network); 28 Sep 2015 04:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIG-0003MX-Lj for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIF-0004ht-PQ for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:03 +0000 Date: Mon, 28 Sep 2015 04:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13a30798d12e7a355173fe9cf149b3a4c6dc46b8 Author: Ian Jackson AuthorDate: Fri Sep 11 11:50:48 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:50:48 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 95c2875..0aaed5f 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= e1db2596d7c5f8be876481148d407f0cb207b494 -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TAG ?= 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4 +# Mon Jun 30 10:07:54 2014 +0200 +# vnc: limit client_cut_text msg payload size # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04: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 1ZgQIK-0005jM-4W; Mon, 28 Sep 2015 04:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQII-0005jH-Tu for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:07 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 5E/E1-13905-695C8065; Mon, 28 Sep 2015 04:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1443415444!38098914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19227 invoked from network); 28 Sep 2015 04:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIG-0003MX-Lj for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIF-0004ht-PQ for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:03 +0000 Date: Mon, 28 Sep 2015 04:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13a30798d12e7a355173fe9cf149b3a4c6dc46b8 Author: Ian Jackson AuthorDate: Fri Sep 11 11:50:48 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:50:48 2015 +0100 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 95c2875..0aaed5f 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= e1db2596d7c5f8be876481148d407f0cb207b494 -# Wed Jun 3 14:41:27 2015 +0200 -# ide: Clear DRQ after handling all expected accesses +QEMU_TAG ?= 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4 +# Mon Jun 30 10:07:54 2014 +0200 +# vnc: limit client_cut_text msg payload size # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIV-0005jv-7e; Mon, 28 Sep 2015 04:44:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIT-0005jl-G8 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:17 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id B9/02-13905-0A5C8065; Mon, 28 Sep 2015 04:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1443415455!13757850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30728 invoked from network); 28 Sep 2015 04:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIQ-0003Mb-V0 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIQ-0004il-Qk for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:14 +0000 Date: Mon, 28 Sep 2015 04:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: fix leak of config_data in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d394a43552434fbe62b9495b88ea8f2bfc12550 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:43 2013 +1200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:56:51 2015 +0100 libxl: fix leak of config_data in main_cpupoolcreate Coverity-ID: 1087193 Signed-off-by: Matthew Daley Acked-by: Ian Campbell (cherry picked from commit 7737ecb20c5babff45445d27fff91894b43a2d28) --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 95919eb..55b4064 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6536,6 +6536,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(config_data); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIV-0005jv-7e; Mon, 28 Sep 2015 04:44:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIT-0005jl-G8 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:17 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id B9/02-13905-0A5C8065; Mon, 28 Sep 2015 04:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1443415455!13757850!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30728 invoked from network); 28 Sep 2015 04:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIQ-0003Mb-V0 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIQ-0004il-Qk for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:14 +0000 Date: Mon, 28 Sep 2015 04:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: fix leak of config_data in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d394a43552434fbe62b9495b88ea8f2bfc12550 Author: Matthew Daley AuthorDate: Wed Sep 18 15:37:43 2013 +1200 Commit: Ian Jackson CommitDate: Fri Sep 11 11:56:51 2015 +0100 libxl: fix leak of config_data in main_cpupoolcreate Coverity-ID: 1087193 Signed-off-by: Matthew Daley Acked-by: Ian Campbell (cherry picked from commit 7737ecb20c5babff45445d27fff91894b43a2d28) --- tools/libxl/xl_cmdimpl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 95919eb..55b4064 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6536,6 +6536,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(config_data); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIe-0005lC-AO; Mon, 28 Sep 2015 04:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQId-0005kw-EU for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:27 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id DB/10-28791-AA5C8065; Mon, 28 Sep 2015 04:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1443415465!53494416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19888 invoked from network); 28 Sep 2015 04:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIb-0003Mn-47 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIb-0004jA-2a for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:25 +0000 Date: Mon, 28 Sep 2015 04:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xl: correct handling of extra_config in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f97021eb92e91db8032d600893a531863a18bd23 Author: Wei Liu AuthorDate: Tue Jul 14 17:41:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:56:56 2015 +0100 xl: correct handling of extra_config in main_cpupoolcreate Don't dereference extra_config if it's NULL. Don't leak extra_config in the end. Also fixed a typo in error string while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 705c9e12426cba82804cb578fc70785281655d94) (cherry picked from commit ffb4e6387f489b6b5ce287f51db43cb37ebae064) (cherry picked from commit 213e243819ba5f72e13afad41ce2f5df17715530) --- tools/libxl/xl_cmdimpl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 55b4064..784f676 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6412,9 +6412,9 @@ int main_cpupoolcreate(int argc, char **argv) else config_src="command line"; - if (strlen(extra_config)) { + if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { - fprintf(stderr, "Failed to attach extra configration\n"); + fprintf(stderr, "Failed to attach extra configuration\n"); goto out; } config_data = xrealloc(config_data, @@ -6537,6 +6537,7 @@ out_cfg: xlu_cfg_destroy(config); out: free(config_data); + free(extra_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIe-0005lC-AO; Mon, 28 Sep 2015 04:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQId-0005kw-EU for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:27 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id DB/10-28791-AA5C8065; Mon, 28 Sep 2015 04:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1443415465!53494416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19888 invoked from network); 28 Sep 2015 04:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIb-0003Mn-47 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIb-0004jA-2a for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:25 +0000 Date: Mon, 28 Sep 2015 04:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] xl: correct handling of extra_config in main_cpupoolcreate X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f97021eb92e91db8032d600893a531863a18bd23 Author: Wei Liu AuthorDate: Tue Jul 14 17:41:10 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 11 11:56:56 2015 +0100 xl: correct handling of extra_config in main_cpupoolcreate Don't dereference extra_config if it's NULL. Don't leak extra_config in the end. Also fixed a typo in error string while I was there. Signed-off-by: Wei Liu Acked-by: Ian Jackson (cherry picked from commit 705c9e12426cba82804cb578fc70785281655d94) (cherry picked from commit ffb4e6387f489b6b5ce287f51db43cb37ebae064) (cherry picked from commit 213e243819ba5f72e13afad41ce2f5df17715530) --- tools/libxl/xl_cmdimpl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 55b4064..784f676 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -6412,9 +6412,9 @@ int main_cpupoolcreate(int argc, char **argv) else config_src="command line"; - if (strlen(extra_config)) { + if (extra_config && strlen(extra_config)) { if (config_len > INT_MAX - (strlen(extra_config) + 2)) { - fprintf(stderr, "Failed to attach extra configration\n"); + fprintf(stderr, "Failed to attach extra configuration\n"); goto out; } config_data = xrealloc(config_data, @@ -6537,6 +6537,7 @@ out_cfg: xlu_cfg_destroy(config); out: free(config_data); + free(extra_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIo-0005mX-DO; Mon, 28 Sep 2015 04:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIn-0005mN-HI for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:37 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 4C/C4-04752-4B5C8065; Mon, 28 Sep 2015 04:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1443415475!53526009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19808 invoked from network); 28 Sep 2015 04:44:36 -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; 28 Sep 2015 04:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIl-0003Mv-8z for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIl-0004k8-7w for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:35 +0000 Date: Mon, 28 Sep 2015 04:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Increase device model startup timeout to 1min. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d81366482a2fbc418cc96bd2d9875ae99da612c Author: Anthony PERARD AuthorDate: Tue Jul 7 16:09:13 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 18 16:29:55 2015 +0100 libxl: Increase device model startup timeout to 1min. On a busy host, QEMU may take more than 10s to load and start. This is likely due to a bug in Linux where the I/O subsystem sometime produce high latency under load and result in QEMU taking a long time to load every single dynamic libraries. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson (cherry picked from commit 9acfbe14d7261b03e3b3f4dc3c850ba2a7093e1f) Conflicts: tools/libxl/libxl_internal.h (cherry picked from commit bbbd29a25d090f1180d14210358c6d7ccdebef85) (cherry picked from commit fe66a76a2d6e30f2cd3aea6b2c8cb41f20ca6ea2) --- tools/libxl/libxl_internal.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 63e206e..70200f3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -83,7 +83,9 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_HOTPLUG_TIMEOUT 10 -#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +/* QEMU may be slow to load and start due to a bug in Linux where the I/O + * subsystem sometime produce high latency under load. */ +#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIo-0005mX-DO; Mon, 28 Sep 2015 04:44:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIn-0005mN-HI for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:37 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 4C/C4-04752-4B5C8065; Mon, 28 Sep 2015 04:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1443415475!53526009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19808 invoked from network); 28 Sep 2015 04:44:36 -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; 28 Sep 2015 04:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIl-0003Mv-8z for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIl-0004k8-7w for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:35 +0000 Date: Mon, 28 Sep 2015 04:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Increase device model startup timeout to 1min. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6d81366482a2fbc418cc96bd2d9875ae99da612c Author: Anthony PERARD AuthorDate: Tue Jul 7 16:09:13 2015 +0100 Commit: Ian Jackson CommitDate: Fri Sep 18 16:29:55 2015 +0100 libxl: Increase device model startup timeout to 1min. On a busy host, QEMU may take more than 10s to load and start. This is likely due to a bug in Linux where the I/O subsystem sometime produce high latency under load and result in QEMU taking a long time to load every single dynamic libraries. Signed-off-by: Anthony PERARD Acked-by: Ian Jackson (cherry picked from commit 9acfbe14d7261b03e3b3f4dc3c850ba2a7093e1f) Conflicts: tools/libxl/libxl_internal.h (cherry picked from commit bbbd29a25d090f1180d14210358c6d7ccdebef85) (cherry picked from commit fe66a76a2d6e30f2cd3aea6b2c8cb41f20ca6ea2) --- tools/libxl/libxl_internal.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 63e206e..70200f3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -83,7 +83,9 @@ #define LIBXL_INIT_TIMEOUT 10 #define LIBXL_DESTROY_TIMEOUT 10 #define LIBXL_HOTPLUG_TIMEOUT 10 -#define LIBXL_DEVICE_MODEL_START_TIMEOUT 10 +/* QEMU may be slow to load and start due to a bug in Linux where the I/O + * subsystem sometime produce high latency under load. */ +#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60 #define LIBXL_QEMU_BODGE_TIMEOUT 2 #define LIBXL_XENCONSOLE_LIMIT 1048576 #define LIBXL_XENCONSOLE_PROTOCOL "vt100" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIz-0005oO-Ge; Mon, 28 Sep 2015 04:44:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIy-0005o8-Gp for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:48 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id E0/D6-12371-FB5C8065; Mon, 28 Sep 2015 04:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1443415486!53443161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31523 invoked from network); 28 Sep 2015 04:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIw-0003N3-7c for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIv-0004kX-Ca for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:45 +0000 Date: Mon, 28 Sep 2015 04:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: handle read-only drives with qemu-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 998424e33db121270690586320e899a03c88b4aa Author: Stefano Stabellini AuthorDate: Tue Sep 22 16:56:35 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 22 16:56:35 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Backport to Xen 4.5 and earlier, apropos of report and review from Michael Young. Signed-off-by: Ian Jackson --- tools/libxl/libxl_dm.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8a83103..be0757e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -624,13 +624,18 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback,id=ide-%i", - disk, dev_number); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback,id=ide-%i", + disk, disks[i].readwrite ? "off" : "on", dev_number); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback,id=ide-%i", - disks[i].pdev_path, disk, format, dev_number); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback,id=ide-%i", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return NULL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 04:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 04:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIz-0005oO-Ge; Mon, 28 Sep 2015 04:44:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIy-0005o8-Gp for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:48 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id E0/D6-12371-FB5C8065; Mon, 28 Sep 2015 04:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1443415486!53443161!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31523 invoked from network); 28 Sep 2015 04:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 04:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgQIw-0003N3-7c for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgQIv-0004kX-Ca for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 04:44:45 +0000 Date: Mon, 28 Sep 2015 04:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: handle read-only drives with qemu-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 998424e33db121270690586320e899a03c88b4aa Author: Stefano Stabellini AuthorDate: Tue Sep 22 16:56:35 2015 +0100 Commit: Ian Jackson CommitDate: Tue Sep 22 16:56:35 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Backport to Xen 4.5 and earlier, apropos of report and review from Michael Young. Signed-off-by: Ian Jackson --- tools/libxl/libxl_dm.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8a83103..be0757e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -624,13 +624,18 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback,id=ide-%i", - disk, dev_number); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback,id=ide-%i", + disk, disks[i].readwrite ? "off" : "on", dev_number); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback,id=ide-%i", - disks[i].pdev_path, disk, format, dev_number); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback,id=ide-%i", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return NULL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 08:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 08:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgU2Z-0004X6-CV; Mon, 28 Sep 2015 08: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 1ZgU2Y-0004X1-NE for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 08:44:06 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id FB/92-19220-6DDF8065; Mon, 28 Sep 2015 08:44:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-206.messagelabs.com!1443429844!38155614!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9344 invoked from network); 28 Sep 2015 08:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 08:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgU2W-0006NQ-0c for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 08:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgU2V-000215-1N for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 08:44:03 +0000 Message-Id: Date: Mon, 28 Sep 2015 08:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] usbback: correct copy length for partial transfers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Juergen Gross # Date 1443429534 -7200 # Node ID 47161cb7bd45c059b8e75c09d59ee1124953ad46 # Parent b4bb467e5c077745957e26ea6872cfc65e87e4c2 usbback: correct copy length for partial transfers Commit 72387b3c2252 ("usbback: copy only filled buffers to guest") has introduced an error leading to copying the wrong amount of data to the guest in case of read I/Os with not the complete buffer filled. Depending on the amount of data read either too much or not enough data was copied: if a buffer segment was filled less than half still some data of the backend kernel could leak into the guest, while a buffer segment filled more than half of it's size wouldn't be copied completely. Correct this by limiting the to be copied data amount to the rest length of the read data. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r b4bb467e5c07 -r 47161cb7bd45 drivers/xen/usbback/usbback.c --- a/drivers/xen/usbback/usbback.c Wed Sep 09 09:52:22 2015 +0200 +++ b/drivers/xen/usbback/usbback.c Mon Sep 28 10:38:54 2015 +0200 @@ -213,7 +213,7 @@ static void copy_buff_to_pages(void *buf buf_off += offset - buf_off; } if (buf_off + len > offset + length) - len -= offset + length - buf_off; + len = offset + length - buf_off; memcpy((void *)vaddr(pending_req, i) + off, buff + buf_off, len); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 08:44:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 08:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgU2Z-0004X6-CV; Mon, 28 Sep 2015 08: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 1ZgU2Y-0004X1-NE for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 08:44:06 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id FB/92-19220-6DDF8065; Mon, 28 Sep 2015 08:44:06 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-12.tower-206.messagelabs.com!1443429844!38155614!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9344 invoked from network); 28 Sep 2015 08:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 08:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgU2W-0006NQ-0c for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 08:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgU2V-000215-1N for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 08:44:03 +0000 Message-Id: Date: Mon, 28 Sep 2015 08:44:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] usbback: correct copy length for partial transfers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Juergen Gross # Date 1443429534 -7200 # Node ID 47161cb7bd45c059b8e75c09d59ee1124953ad46 # Parent b4bb467e5c077745957e26ea6872cfc65e87e4c2 usbback: correct copy length for partial transfers Commit 72387b3c2252 ("usbback: copy only filled buffers to guest") has introduced an error leading to copying the wrong amount of data to the guest in case of read I/Os with not the complete buffer filled. Depending on the amount of data read either too much or not enough data was copied: if a buffer segment was filled less than half still some data of the backend kernel could leak into the guest, while a buffer segment filled more than half of it's size wouldn't be copied completely. Correct this by limiting the to be copied data amount to the rest length of the read data. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r b4bb467e5c07 -r 47161cb7bd45 drivers/xen/usbback/usbback.c --- a/drivers/xen/usbback/usbback.c Wed Sep 09 09:52:22 2015 +0200 +++ b/drivers/xen/usbback/usbback.c Mon Sep 28 10:38:54 2015 +0200 @@ -213,7 +213,7 @@ static void copy_buff_to_pages(void *buf buf_off += offset - buf_off; } if (buf_off + len > offset + length) - len -= offset + length - buf_off; + len = offset + length - buf_off; memcpy((void *)vaddr(pending_req, i) + off, buff + buf_off, len); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14: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 1ZgZf0-0008Oc-FX; Mon, 28 Sep 2015 14:44:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZez-0008ON-4k for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:09 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id F0/F7-00536-83259065; Mon, 28 Sep 2015 14:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1443451446!48267075!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9144 invoked from network); 28 Sep 2015 14:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZev-0001dW-Ut for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZeu-0002ws-O4 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:05 +0000 Date: Mon, 28 Sep 2015 14:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/MSI: fail if no hardware support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d892e95616bfce807eac63d0389f03bd1187c0e5 Author: Jan Beulich AuthorDate: Wed Sep 16 11:27:40 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:27:40 2015 +0200 x86/MSI: fail if no hardware support This is to guard against buggy callers (luckily Dom0 only) invoking the respective hypercall for a device not being MSI-capable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu master commit: c7d5d5d8ea1ecbd6ef8b47dace4dec825f0f6e48 master date: 2015-09-16 11:20:27 +0200 --- xen/arch/x86/msi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 588305a..3dbb84d 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -696,6 +696,8 @@ static int msi_capability_init(struct pci_dev *dev, ASSERT(spin_is_locked(&pcidevs_lock)); pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + if ( !pos ) + return -ENODEV; control = pci_conf_read16(seg, bus, slot, func, msi_control_reg(pos)); maxvec = multi_msi_capable(control); if ( nvec > maxvec ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14: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 1ZgZf0-0008Oc-FX; Mon, 28 Sep 2015 14:44:10 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZez-0008ON-4k for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:09 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id F0/F7-00536-83259065; Mon, 28 Sep 2015 14:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1443451446!48267075!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9144 invoked from network); 28 Sep 2015 14:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZev-0001dW-Ut for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZeu-0002ws-O4 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:05 +0000 Date: Mon, 28 Sep 2015 14:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/MSI: fail if no hardware support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d892e95616bfce807eac63d0389f03bd1187c0e5 Author: Jan Beulich AuthorDate: Wed Sep 16 11:27:40 2015 +0200 Commit: Jan Beulich CommitDate: Wed Sep 16 11:27:40 2015 +0200 x86/MSI: fail if no hardware support This is to guard against buggy callers (luckily Dom0 only) invoking the respective hypercall for a device not being MSI-capable. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Release-acked-by: Wei Liu master commit: c7d5d5d8ea1ecbd6ef8b47dace4dec825f0f6e48 master date: 2015-09-16 11:20:27 +0200 --- xen/arch/x86/msi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c index 588305a..3dbb84d 100644 --- a/xen/arch/x86/msi.c +++ b/xen/arch/x86/msi.c @@ -696,6 +696,8 @@ static int msi_capability_init(struct pci_dev *dev, ASSERT(spin_is_locked(&pcidevs_lock)); pos = pci_find_cap_offset(seg, bus, slot, func, PCI_CAP_ID_MSI); + if ( !pos ) + return -ENODEV; control = pci_conf_read16(seg, bus, slot, func, msi_control_reg(pos)); maxvec = multi_msi_capable(control); if ( nvec > maxvec ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZfA-0008QD-IS; Mon, 28 Sep 2015 14:44:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZf9-0008Py-Vo for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:20 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id A7/79-25435-34259065; Mon, 28 Sep 2015 14:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1443451456!53742289!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2014 invoked from network); 28 Sep 2015 14:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZf6-0001da-GH for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZf6-0002ys-Dp for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:16 +0000 Date: Mon, 28 Sep 2015 14:44:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 878d9320a8ae70646bdbbe41dfe652b6af7dd4d7 Author: Chunyan Liu AuthorDate: Wed Sep 16 14:16:09 2015 +0800 Commit: Ian Campbell CommitDate: Thu Sep 17 12:15:11 2015 +0100 libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore Run "xl pci-attach ", the 2nd time fails: xl: libxl_xshelp.c:209: libxl__xs_transaction_start: Assertion `!*t' failed. Aborted To fix that, initialize xs_transaction to avoid libxl__xs_transaction_start assertion error. Signed-off-by: Chunyan Liu Acked-by: Ian Campbell [ ijc -- updated commit message ] (cherry picked from commit 4600d7560425f89b32cd90ecf6084bae9293dfab) --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 1ebdce7..19c597e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -123,7 +123,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d flexarray_t *back; char *num_devs, *be_path; int num = 0; - xs_transaction_t t; + xs_transaction_t t = XBT_NULL; libxl__device *device; int rc; libxl_domain_config d_config; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZfA-0008QD-IS; Mon, 28 Sep 2015 14:44:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZf9-0008Py-Vo for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:20 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id A7/79-25435-34259065; Mon, 28 Sep 2015 14:44:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1443451456!53742289!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2014 invoked from network); 28 Sep 2015 14:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZf6-0001da-GH for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZf6-0002ys-Dp for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:16 +0000 Date: Mon, 28 Sep 2015 14:44:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 878d9320a8ae70646bdbbe41dfe652b6af7dd4d7 Author: Chunyan Liu AuthorDate: Wed Sep 16 14:16:09 2015 +0800 Commit: Ian Campbell CommitDate: Thu Sep 17 12:15:11 2015 +0100 libxl: ensure xs transaction is initialised in libxl__device_pci_add_xenstore Run "xl pci-attach ", the 2nd time fails: xl: libxl_xshelp.c:209: libxl__xs_transaction_start: Assertion `!*t' failed. Aborted To fix that, initialize xs_transaction to avoid libxl__xs_transaction_start assertion error. Signed-off-by: Chunyan Liu Acked-by: Ian Campbell [ ijc -- updated commit message ] (cherry picked from commit 4600d7560425f89b32cd90ecf6084bae9293dfab) --- tools/libxl/libxl_pci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 1ebdce7..19c597e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -123,7 +123,7 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d flexarray_t *back; char *num_devs, *be_path; int num = 0; - xs_transaction_t t; + xs_transaction_t t = XBT_NULL; libxl__device *device; int rc; libxl_domain_config d_config; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZfK-0008SX-LA; Mon, 28 Sep 2015 14:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfJ-0008SH-MU for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:29 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 46/08-10678-C4259065; Mon, 28 Sep 2015 14:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1443451467!47027947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30408 invoked from network); 28 Sep 2015 14:44:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfG-0001dj-SP for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfG-0002zw-Lk for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:26 +0000 Date: Mon, 28 Sep 2015 14:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63e3edcc6c5f4ffcee7f0f63a161ba6f58ac99ed Author: Andrew Cooper AuthorDate: Wed Sep 16 11:22:00 2015 +0200 Commit: Ian Campbell CommitDate: Thu Sep 17 12:22:08 2015 +0100 x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) There is no current problem, as both NCAPINTS and pi->hw_cap are 8 entries, but the limit should be calculated appropriately so as to avoid hypervisor stack corruption if the two do get out of sync. Signed-off-by: Andrew Cooper (cherry picked from commit c373b912e74659f0e0898ae93e89513694cfd94e) --- xen/arch/x86/sysctl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index f36b52f..38b5dcb 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -75,7 +75,8 @@ long cpu_down_helper(void *data) void arch_do_physinfo(xen_sysctl_physinfo_t *pi) { - memcpy(pi->hw_cap, boot_cpu_data.x86_capability, NCAPINTS*4); + memcpy(pi->hw_cap, boot_cpu_data.x86_capability, + min(sizeof(pi->hw_cap), sizeof(boot_cpu_data.x86_capability))); if ( hvm_enabled ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm; if ( iommu_enabled ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZfK-0008SX-LA; Mon, 28 Sep 2015 14:44:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfJ-0008SH-MU for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:29 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 46/08-10678-C4259065; Mon, 28 Sep 2015 14:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1443451467!47027947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30408 invoked from network); 28 Sep 2015 14:44:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfG-0001dj-SP for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfG-0002zw-Lk for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:26 +0000 Date: Mon, 28 Sep 2015 14:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63e3edcc6c5f4ffcee7f0f63a161ba6f58ac99ed Author: Andrew Cooper AuthorDate: Wed Sep 16 11:22:00 2015 +0200 Commit: Ian Campbell CommitDate: Thu Sep 17 12:22:08 2015 +0100 x86/sysctl: don't clobber memory if NCAPINTS > ARRAY_SIZE(pi->hw_cap) There is no current problem, as both NCAPINTS and pi->hw_cap are 8 entries, but the limit should be calculated appropriately so as to avoid hypervisor stack corruption if the two do get out of sync. Signed-off-by: Andrew Cooper (cherry picked from commit c373b912e74659f0e0898ae93e89513694cfd94e) --- xen/arch/x86/sysctl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c index f36b52f..38b5dcb 100644 --- a/xen/arch/x86/sysctl.c +++ b/xen/arch/x86/sysctl.c @@ -75,7 +75,8 @@ long cpu_down_helper(void *data) void arch_do_physinfo(xen_sysctl_physinfo_t *pi) { - memcpy(pi->hw_cap, boot_cpu_data.x86_capability, NCAPINTS*4); + memcpy(pi->hw_cap, boot_cpu_data.x86_capability, + min(sizeof(pi->hw_cap), sizeof(boot_cpu_data.x86_capability))); if ( hvm_enabled ) pi->capabilities |= XEN_SYSCTL_PHYSCAP_hvm; if ( iommu_enabled ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZfU-0008Uh-Nh; Mon, 28 Sep 2015 14:44:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfT-0008UK-MS for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:39 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 2E/81-22089-75259065; Mon, 28 Sep 2015 14:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1443451477!22570542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11430 invoked from network); 28 Sep 2015 14:44:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfR-0001dz-4W for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfR-00030O-2E for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:37 +0000 Date: Mon, 28 Sep 2015 14:44:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] docs: Template for feature documents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17588f6352d59f8ef74a180faca2be892eb7c49e Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:26 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:28:09 2015 +0100 docs: Template for feature documents Signed-off-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit d02bed2a3926ca65f6d49eeb034eab00c532d22b) --- docs/Makefile | 2 +- docs/features/template.pandoc | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index d25e6c7..b9da605 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,7 +15,7 @@ MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) +PANDOCSRC-y := $(sort $(shell find features/ misc/ specs/ -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) diff --git a/docs/features/template.pandoc b/docs/features/template.pandoc new file mode 100644 index 0000000..7698291 --- /dev/null +++ b/docs/features/template.pandoc @@ -0,0 +1,75 @@ +% Template for feature documents +% Revision $N + +\clearpage + +This is a suggested template for formatting of a Xen feature document in +tree. + +The purpose of this document is to provide a concrete support statement +for the feature (indicating its security status), as well as brief user +and technical documentation. + +# Basics + +A table with an overview of the support status and applicability. + +---------------- ---------------------------------------------------- + Status: e.g. **Supported**/**Tech Preview**/**Experimental** + +Architecture(s): e.g. x86, arm + + Component(s): e.g. Hypervisor, toolstack, guest + + Hardware: _where applicable_ +---------------- ---------------------------------------------------- + +# Overview + +A short description the feature, similar to an abstract for a +paper/presentation. + +# User information + +Information for a user attempting to use the feature. Should include +how to enable the feature (is it enabled by default? If not, how to turn +it on?), and how to interact with the feature (typically via `xl`). + +# Limitations + +Information concerning incompatibilities with other features or hardware +combinations. + +# Technical information + +Information for a developer or power user. Should include where to look +in-tree for detailed documents and code. + +# Testing + +Information concerning how to properly test changes affecting this feature. + +# Areas for improvement + +List of enhancements which could be undertaken, e.g. to improve the +feature itself, or improve interaction with other features. + +# Known issues + +List of known issues or bugs. For tech preview or experimental +features, this section must contain the list of items needing fixing for +its status to be upgraded. + +# References + +Relevant external references for this feature. + +# History + +A table of changes to the document, in chronological order. + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +YYYY-MM-DD N Xen X.Y ... +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZfU-0008Uh-Nh; Mon, 28 Sep 2015 14:44:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfT-0008UK-MS for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:39 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 2E/81-22089-75259065; Mon, 28 Sep 2015 14:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1443451477!22570542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11430 invoked from network); 28 Sep 2015 14:44:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfR-0001dz-4W for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfR-00030O-2E for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:37 +0000 Date: Mon, 28 Sep 2015 14:44:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] docs: Template for feature documents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 17588f6352d59f8ef74a180faca2be892eb7c49e Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:26 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:28:09 2015 +0100 docs: Template for feature documents Signed-off-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit d02bed2a3926ca65f6d49eeb034eab00c532d22b) --- docs/Makefile | 2 +- docs/features/template.pandoc | 75 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index d25e6c7..b9da605 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,7 +15,7 @@ MARKDOWNSRC-y := $(sort $(shell find misc -name '*.markdown' -print)) TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(shell find specs -name '*.pandoc' -print)) +PANDOCSRC-y := $(sort $(shell find features/ misc/ specs/ -name '*.pandoc' -print)) # Documentation targets DOC_MAN1 := $(patsubst man/%.pod.1,man1/%.1,$(MAN1SRC-y)) diff --git a/docs/features/template.pandoc b/docs/features/template.pandoc new file mode 100644 index 0000000..7698291 --- /dev/null +++ b/docs/features/template.pandoc @@ -0,0 +1,75 @@ +% Template for feature documents +% Revision $N + +\clearpage + +This is a suggested template for formatting of a Xen feature document in +tree. + +The purpose of this document is to provide a concrete support statement +for the feature (indicating its security status), as well as brief user +and technical documentation. + +# Basics + +A table with an overview of the support status and applicability. + +---------------- ---------------------------------------------------- + Status: e.g. **Supported**/**Tech Preview**/**Experimental** + +Architecture(s): e.g. x86, arm + + Component(s): e.g. Hypervisor, toolstack, guest + + Hardware: _where applicable_ +---------------- ---------------------------------------------------- + +# Overview + +A short description the feature, similar to an abstract for a +paper/presentation. + +# User information + +Information for a user attempting to use the feature. Should include +how to enable the feature (is it enabled by default? If not, how to turn +it on?), and how to interact with the feature (typically via `xl`). + +# Limitations + +Information concerning incompatibilities with other features or hardware +combinations. + +# Technical information + +Information for a developer or power user. Should include where to look +in-tree for detailed documents and code. + +# Testing + +Information concerning how to properly test changes affecting this feature. + +# Areas for improvement + +List of enhancements which could be undertaken, e.g. to improve the +feature itself, or improve interaction with other features. + +# Known issues + +List of known issues or bugs. For tech preview or experimental +features, this section must contain the list of items needing fixing for +its status to be upgraded. + +# References + +Relevant external references for this feature. + +# History + +A table of changes to the document, in chronological order. + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +YYYY-MM-DD N Xen X.Y ... +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZff-00005O-QI; Mon, 28 Sep 2015 14:44:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfe-00004r-45 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:50 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 5E/42-06179-16259065; Mon, 28 Sep 2015 14:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1443451487!32887807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14542 invoked from network); 28 Sep 2015 14:44:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfb-0001e7-C5 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfb-000311-8z for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:47 +0000 Date: Mon, 28 Sep 2015 14:44:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] docs: Migration feature document X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec6462ed3f60ee16feeea79512f02bac62a29429 Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:27 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:28:09 2015 +0100 docs: Migration feature document Signed-off-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 112e5346b048712e194fd1f99f1fb7720d10892b) --- docs/features/migration.pandoc | 123 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/docs/features/migration.pandoc b/docs/features/migration.pandoc new file mode 100644 index 0000000..9852a19 --- /dev/null +++ b/docs/features/migration.pandoc @@ -0,0 +1,123 @@ +% Migration +% Revision 1 + +\clearpage + +# Basics +--------------- ------------- + Status: **Supported** + + Architecture: x86 + + Component: Toolstack +--------------- ------------- + +# Overview + +Migration is a mechanism to move a virtual machine while the VM is +running. Live migration moves a running virtual machine between two +physical servers, but the same mechanism can be used for non-live +migration (pause and copy) and suspend/resume from disk. + +# User details + +No hardware requirements, although hypervisor logdirty support is +required for live migration. + +From the command line, `xl migrate/save/restore` are the top level +interactions. e.g. + + xl create my-vm.cfg + xl migrate my-vm localhost + +or + + xl create my-vm.cfg + xl save my-vm /path/to/save/file + xl restore /path/to/save/file + +Xen 4.6 sees the introduction of Migration v2. There is no change for +people using `xl`, although the `libxl` API has had an extension. + +# Technical details + +Migration is formed of several layers. `libxc` is responsible for the +contents of the VM (ram, vcpus, etc) and the live migration loop, while +`libxl` is responsible for items such as emulator state. + +The format of the migration v2 stream is specified in two documents, and +is architecture neutral. Compatibility with legacy streams is +maintained via the `convert-legacy-stream` script which transforms a +legacy stream into a migration v2 stream. + +* Documents + * `docs/specs/libxc-migration-stream.pandoc` + * `docs/specs/libxl-migration-stream.pandoc` +* `libxc` + * `tools/libxc/xc_sr_*.[hc]` +* `libxl` + * `tools/libxl/libxl_stream_{read,write}.c` + * `tools/libxl/libxl_convert_callout.c` +* Scripts + * `tools/python/xen/migration/*.py` + * `tools/python/scripts/convert-legacy-stream` + * `tools/python/scripts/verify-stream-v2` + +## libxl + +With migration v2 support, LIBXL\_HAVE\_SRM\_V2 and LIBXL\_HAVE\_SRM\_V1 +are introduced to indicate support. `domain_restore_params` gains a new +parameter, `stream_version`, which is used to distinguish between legacy and +v2 migration streams, and hence whether legacy conversion is required. + +# Limitations + +Hypervisor logdirty support is incompatible with hardware passthrough, +as IOMMU faults cannot be used to track writes. + +While not a bug in migration specifically, VMs are very sensitive to +changes in cpuid information, and cpuid levelling support currently has +its issues. Extreme care should be taken when migrating VMs between +non-identical CPUs until the cpuid levelling improvements are complete. + +# Testing + +Changes in libxc should be tested with every guest type (32bit PV, 64bit +PV, HVM), while changes in libxl should test HVM guests with both +qemu-traditional and qemu-upstream. + +In general, testing can be done on a single host using `xl +save/restore` or `xl migrate $VM localhost`. + +Any changes to the conversion script should be tested in all upgrade +scenarios, which will involve starting with VMs from Xen 4.5 + +# Areas for improvement + +* Arm support +* Linear P2M support for x86 PV +* Live looping parameters + +# Known issues + +* x86 HVM guest physmap operations (not reflected in logdirty bitmap) +* x86 HVM with PoD pages (attempts to map cause PoD allocations) +* x86 HVM with nested-virt (no relevant information included in the + stream) +* x86 PV ballooning (P2M marked dirty, target frame not marked) +* x86 PV P2M structure changes (not noticed, stale mappings used) + +# References + +Xen Developer Summit 2015 Presentation +[video](https://www.youtube.com/watch?v=RwiDeG21lrc) and +[slides](http://events.linuxfoundation.org/sites/events/files/slides/migv2.pdf) +for Migration v2 + +# History + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +2015-10-24 1 Xen 4.6 Document written +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:44:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:44: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 1ZgZff-00005O-QI; Mon, 28 Sep 2015 14:44:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfe-00004r-45 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:50 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 5E/42-06179-16259065; Mon, 28 Sep 2015 14:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1443451487!32887807!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14542 invoked from network); 28 Sep 2015 14:44:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:44:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfb-0001e7-C5 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfb-000311-8z for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:47 +0000 Date: Mon, 28 Sep 2015 14:44:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] docs: Migration feature document X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec6462ed3f60ee16feeea79512f02bac62a29429 Author: Andrew Cooper AuthorDate: Tue Sep 15 14:54:27 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:28:09 2015 +0100 docs: Migration feature document Signed-off-by: Andrew Cooper Acked-by: Ian Campbell (cherry picked from commit 112e5346b048712e194fd1f99f1fb7720d10892b) --- docs/features/migration.pandoc | 123 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/docs/features/migration.pandoc b/docs/features/migration.pandoc new file mode 100644 index 0000000..9852a19 --- /dev/null +++ b/docs/features/migration.pandoc @@ -0,0 +1,123 @@ +% Migration +% Revision 1 + +\clearpage + +# Basics +--------------- ------------- + Status: **Supported** + + Architecture: x86 + + Component: Toolstack +--------------- ------------- + +# Overview + +Migration is a mechanism to move a virtual machine while the VM is +running. Live migration moves a running virtual machine between two +physical servers, but the same mechanism can be used for non-live +migration (pause and copy) and suspend/resume from disk. + +# User details + +No hardware requirements, although hypervisor logdirty support is +required for live migration. + +From the command line, `xl migrate/save/restore` are the top level +interactions. e.g. + + xl create my-vm.cfg + xl migrate my-vm localhost + +or + + xl create my-vm.cfg + xl save my-vm /path/to/save/file + xl restore /path/to/save/file + +Xen 4.6 sees the introduction of Migration v2. There is no change for +people using `xl`, although the `libxl` API has had an extension. + +# Technical details + +Migration is formed of several layers. `libxc` is responsible for the +contents of the VM (ram, vcpus, etc) and the live migration loop, while +`libxl` is responsible for items such as emulator state. + +The format of the migration v2 stream is specified in two documents, and +is architecture neutral. Compatibility with legacy streams is +maintained via the `convert-legacy-stream` script which transforms a +legacy stream into a migration v2 stream. + +* Documents + * `docs/specs/libxc-migration-stream.pandoc` + * `docs/specs/libxl-migration-stream.pandoc` +* `libxc` + * `tools/libxc/xc_sr_*.[hc]` +* `libxl` + * `tools/libxl/libxl_stream_{read,write}.c` + * `tools/libxl/libxl_convert_callout.c` +* Scripts + * `tools/python/xen/migration/*.py` + * `tools/python/scripts/convert-legacy-stream` + * `tools/python/scripts/verify-stream-v2` + +## libxl + +With migration v2 support, LIBXL\_HAVE\_SRM\_V2 and LIBXL\_HAVE\_SRM\_V1 +are introduced to indicate support. `domain_restore_params` gains a new +parameter, `stream_version`, which is used to distinguish between legacy and +v2 migration streams, and hence whether legacy conversion is required. + +# Limitations + +Hypervisor logdirty support is incompatible with hardware passthrough, +as IOMMU faults cannot be used to track writes. + +While not a bug in migration specifically, VMs are very sensitive to +changes in cpuid information, and cpuid levelling support currently has +its issues. Extreme care should be taken when migrating VMs between +non-identical CPUs until the cpuid levelling improvements are complete. + +# Testing + +Changes in libxc should be tested with every guest type (32bit PV, 64bit +PV, HVM), while changes in libxl should test HVM guests with both +qemu-traditional and qemu-upstream. + +In general, testing can be done on a single host using `xl +save/restore` or `xl migrate $VM localhost`. + +Any changes to the conversion script should be tested in all upgrade +scenarios, which will involve starting with VMs from Xen 4.5 + +# Areas for improvement + +* Arm support +* Linear P2M support for x86 PV +* Live looping parameters + +# Known issues + +* x86 HVM guest physmap operations (not reflected in logdirty bitmap) +* x86 HVM with PoD pages (attempts to map cause PoD allocations) +* x86 HVM with nested-virt (no relevant information included in the + stream) +* x86 PV ballooning (P2M marked dirty, target frame not marked) +* x86 PV P2M structure changes (not noticed, stale mappings used) + +# References + +Xen Developer Summit 2015 Presentation +[video](https://www.youtube.com/watch?v=RwiDeG21lrc) and +[slides](http://events.linuxfoundation.org/sites/events/files/slides/migv2.pdf) +for Migration v2 + +# History + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +2015-10-24 1 Xen 4.6 Document written +---------- -------- -------- ------------------------------------------- -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfo-000072-Sx; Mon, 28 Sep 2015 14:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfn-00006p-Tw for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:00 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 62/58-28221-B6259065; Mon, 28 Sep 2015 14:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1443451497!53676143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21682 invoked from network); 28 Sep 2015 14:44:58 -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; 28 Sep 2015 14:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfl-0001eH-JE for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfl-00031V-I5 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:57 +0000 Date: Mon, 28 Sep 2015 14:44:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] INSTALL: Mention MINIOS_UPSTREAM_URL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab7e499a526337d5b4136a2be4cdfb237f6552d0 Author: Ian Campbell AuthorDate: Thu Sep 17 17:30:50 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:29:56 2015 +0100 INSTALL: Mention MINIOS_UPSTREAM_URL All the other ones seem to be there. Signed-off-by: Ian Campbell Release-acked-by: Wei Liu (cherry picked from commit f304da48779ef71bca723619ddf0b3bf6ae15c8a) --- INSTALL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index 12615ab..56e2950 100644 --- a/INSTALL +++ b/INSTALL @@ -248,6 +248,7 @@ OVMF_UPSTREAM_URL= QEMU_UPSTREAM_URL= QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= +MINIOS_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 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfo-000072-Sx; Mon, 28 Sep 2015 14:45:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfn-00006p-Tw for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:00 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 62/58-28221-B6259065; Mon, 28 Sep 2015 14:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1443451497!53676143!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21682 invoked from network); 28 Sep 2015 14:44:58 -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; 28 Sep 2015 14:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfl-0001eH-JE for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfl-00031V-I5 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:44:57 +0000 Date: Mon, 28 Sep 2015 14:44:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] INSTALL: Mention MINIOS_UPSTREAM_URL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab7e499a526337d5b4136a2be4cdfb237f6552d0 Author: Ian Campbell AuthorDate: Thu Sep 17 17:30:50 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:29:56 2015 +0100 INSTALL: Mention MINIOS_UPSTREAM_URL All the other ones seem to be there. Signed-off-by: Ian Campbell Release-acked-by: Wei Liu (cherry picked from commit f304da48779ef71bca723619ddf0b3bf6ae15c8a) --- INSTALL | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index 12615ab..56e2950 100644 --- a/INSTALL +++ b/INSTALL @@ -248,6 +248,7 @@ OVMF_UPSTREAM_URL= QEMU_UPSTREAM_URL= QEMU_TRADITIONAL_URL= SEABIOS_UPSTREAM_URL= +MINIOS_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 -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZg0-000094-0z; Mon, 28 Sep 2015 14:45:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfy-00008i-KI for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:10 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 37/4A-05979-57259065; Mon, 28 Sep 2015 14:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1443451507!48339496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10932 invoked from network); 28 Sep 2015 14:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfv-0001fN-Pc for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfv-00032L-NR for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:07 +0000 Date: Mon, 28 Sep 2015 14:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: handle read-only drives with qemu-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 d880e985b22825b9569e00f83477f42dc45a037a Author: Stefano Stabellini AuthorDate: Tue Sep 15 10:52:14 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:31:22 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit fa30003c13577b7ae4bbb46252ec1cbabd65c645) --- tools/libxl/libxl_dm.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index c84085e..89b3bb7 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1110,13 +1110,18 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback,id=ide-%i", - disk, dev_number); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback,id=ide-%i", + disk, disks[i].readwrite ? "off" : "on", dev_number); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback,id=ide-%i", - disks[i].pdev_path, disk, format, dev_number); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback,id=ide-%i", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return ERROR_INVAL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZg0-000094-0z; Mon, 28 Sep 2015 14:45:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfy-00008i-KI for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:10 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 37/4A-05979-57259065; Mon, 28 Sep 2015 14:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1443451507!48339496!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10932 invoked from network); 28 Sep 2015 14:45:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:45:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZfv-0001fN-Pc for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZfv-00032L-NR for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:07 +0000 Date: Mon, 28 Sep 2015 14:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: handle read-only drives with qemu-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 d880e985b22825b9569e00f83477f42dc45a037a Author: Stefano Stabellini AuthorDate: Tue Sep 15 10:52:14 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:31:22 2015 +0100 libxl: handle read-only drives with qemu-xen The current libxl code doesn't deal with read-only drives at all. Upstream QEMU and qemu-xen only support read-only cdrom drives: make sure to specify "readonly=on" for cdrom drives and return error in case the user requested a non-cdrom read-only drive. This is XSA-142, discovered by Lin Liu (https://bugzilla.redhat.com/show_bug.cgi?id=1257893). Signed-off-by: Stefano Stabellini Acked-by: Ian Jackson (cherry picked from commit fa30003c13577b7ae4bbb46252ec1cbabd65c645) --- tools/libxl/libxl_dm.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index c84085e..89b3bb7 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1110,13 +1110,18 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, if (disks[i].is_cdrom) { if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) drive = libxl__sprintf - (gc, "if=ide,index=%d,media=cdrom,cache=writeback,id=ide-%i", - disk, dev_number); + (gc, "if=ide,index=%d,readonly=%s,media=cdrom,cache=writeback,id=ide-%i", + disk, disks[i].readwrite ? "off" : "on", dev_number); else drive = libxl__sprintf - (gc, "file=%s,if=ide,index=%d,media=cdrom,format=%s,cache=writeback,id=ide-%i", - disks[i].pdev_path, disk, format, dev_number); + (gc, "file=%s,if=ide,index=%d,readonly=%s,media=cdrom,format=%s,cache=writeback,id=ide-%i", + disks[i].pdev_path, disk, disks[i].readwrite ? "off" : "on", format, dev_number); } else { + if (!disks[i].readwrite) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "qemu-xen doesn't support read-only disk drivers"); + return ERROR_INVAL; + } + if (disks[i].format == LIBXL_DISK_FORMAT_EMPTY) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "cannot support" " empty disk format for %s", disks[i].vdev); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgA-0000BN-5e; Mon, 28 Sep 2015 14:45:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZg8-0000B8-Ns for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:20 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 5B/D8-24494-08259065; Mon, 28 Sep 2015 14:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1443451518!14820463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21719 invoked from network); 28 Sep 2015 14:45:19 -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; 28 Sep 2015 14:45:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZg6-0001fX-94 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZg6-00033Z-5K for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:18 +0000 Date: Mon, 28 Sep 2015 14:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct 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 f9e7b0b7033b8aeabc841f9a4af5985e65d502da Author: Julien Grall AuthorDate: Thu Sep 17 19:00:03 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:32:04 2015 +0100 xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct size On GICv2, the GIC virtual CPU interface is at minimum 8KB. Due some to some necessary quirk for GIC using 64KB stride, we are mapping the region in 2 time. The first mapping is 4KB and the second one is 8KB, i.e 12KB in total. Although the minimum supported size (and widely used) is 8KB. This means that we are mapping 4KB more to any guest using GICv2. While this looks scary at first glance, the GIC virtual CPU interface is most frequently at the end the GIC I/O region. So we will most likely map an an unused I/O region or a mirrored version of GICV for platform using 64KB stride. Nonetheless, fix the second mapping to only map 4KB. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit 493a67ee4a3fd9420e94fa2cf108e2a27961202b) --- xen/arch/arm/vgic-v2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 524787b..fa71598 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -576,10 +576,10 @@ static int vgic_v2_domain_init(struct domain *d) if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); else ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); if ( ret ) return ret; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgA-0000BN-5e; Mon, 28 Sep 2015 14:45:22 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZg8-0000B8-Ns for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:20 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 5B/D8-24494-08259065; Mon, 28 Sep 2015 14:45:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1443451518!14820463!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21719 invoked from network); 28 Sep 2015 14:45:19 -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; 28 Sep 2015 14:45:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZg6-0001fX-94 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZg6-00033Z-5K for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:18 +0000 Date: Mon, 28 Sep 2015 14:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct 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 f9e7b0b7033b8aeabc841f9a4af5985e65d502da Author: Julien Grall AuthorDate: Thu Sep 17 19:00:03 2015 +0100 Commit: Ian Campbell CommitDate: Mon Sep 21 12:32:04 2015 +0100 xen/arm: vgic-v2: Map the GIC virtual CPU interface with the correct size On GICv2, the GIC virtual CPU interface is at minimum 8KB. Due some to some necessary quirk for GIC using 64KB stride, we are mapping the region in 2 time. The first mapping is 4KB and the second one is 8KB, i.e 12KB in total. Although the minimum supported size (and widely used) is 8KB. This means that we are mapping 4KB more to any guest using GICv2. While this looks scary at first glance, the GIC virtual CPU interface is most frequently at the end the GIC I/O region. So we will most likely map an an unused I/O region or a mirrored version of GICV for platform using 64KB stride. Nonetheless, fix the second mapping to only map 4KB. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit 493a67ee4a3fd9420e94fa2cf108e2a27961202b) --- xen/arch/arm/vgic-v2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 524787b..fa71598 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -576,10 +576,10 @@ static int vgic_v2_domain_init(struct domain *d) if ( !platform_has_quirk(PLATFORM_QUIRK_GIC_64K_STRIDE) ) ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + PAGE_SIZE)); else ret = map_mmio_regions(d, paddr_to_pfn(d->arch.vgic.cbase + PAGE_SIZE), - 2, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); + 1, paddr_to_pfn(vgic_v2_hw.vbase + SZ_64K)); if ( ret ) return ret; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgK-0000DD-88; Mon, 28 Sep 2015 14:45:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgI-0000D1-UB for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:31 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id FE/59-23203-A8259065; Mon, 28 Sep 2015 14:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1443451528!48271679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13966 invoked from network); 28 Sep 2015 14:45:29 -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; 28 Sep 2015 14:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgG-0001fk-H0 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgG-00034S-DF for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:28 +0000 Date: Mon, 28 Sep 2015 14:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] vtd: correct loglevel when check group devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b18491f5ca8e4d2f31501e4575e61d559b419e10 Author: Tiejun Chen AuthorDate: Mon Sep 21 16:08:50 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 21 16:08:50 2015 +0200 vtd: correct loglevel when check group devices Since commit 3848058e7dd6 (vtd/iommu: permit group devices to passthrough in relaxed mode) is introduced, we always print message as XENLOG_G_WARNING but its not correct in the case of strict mode. So here is making this message depending on the specific mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian master commit: 92906abbee6d1dc975111a88d83cd3550f71e4c8 master date: 2015-09-16 11:20:54 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 7b45bff..b67b624 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2314,9 +2314,10 @@ static int intel_iommu_assign_device( { bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); - printk(XENLOG_G_WARNING VTDPREFIX + printk(XENLOG_GUEST "%s" VTDPREFIX " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? XENLOG_WARNING : XENLOG_ERR, relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgK-0000DD-88; Mon, 28 Sep 2015 14:45:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgI-0000D1-UB for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:31 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id FE/59-23203-A8259065; Mon, 28 Sep 2015 14:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1443451528!48271679!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13966 invoked from network); 28 Sep 2015 14:45:29 -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; 28 Sep 2015 14:45:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgG-0001fk-H0 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgG-00034S-DF for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:28 +0000 Date: Mon, 28 Sep 2015 14:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] vtd: correct loglevel when check group devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b18491f5ca8e4d2f31501e4575e61d559b419e10 Author: Tiejun Chen AuthorDate: Mon Sep 21 16:08:50 2015 +0200 Commit: Jan Beulich CommitDate: Mon Sep 21 16:08:50 2015 +0200 vtd: correct loglevel when check group devices Since commit 3848058e7dd6 (vtd/iommu: permit group devices to passthrough in relaxed mode) is introduced, we always print message as XENLOG_G_WARNING but its not correct in the case of strict mode. So here is making this message depending on the specific mode. Signed-off-by: Tiejun Chen Acked-by: Kevin Tian master commit: 92906abbee6d1dc975111a88d83cd3550f71e4c8 master date: 2015-09-16 11:20:54 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 7b45bff..b67b624 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2314,9 +2314,10 @@ static int intel_iommu_assign_device( { bool_t relaxed = !!(flag & XEN_DOMCTL_DEV_RDM_RELAXED); - printk(XENLOG_G_WARNING VTDPREFIX + printk(XENLOG_GUEST "%s" VTDPREFIX " It's %s to assign %04x:%02x:%02x.%u" " with shared RMRR at %"PRIx64" for Dom%d.\n", + relaxed ? XENLOG_WARNING : XENLOG_ERR, relaxed ? "risky" : "disallowed", seg, bus, PCI_SLOT(devfn), PCI_FUNC(devfn), rmrr->base_address, d->domain_id); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgX-0000FA-Aq; Mon, 28 Sep 2015 14:45:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgV-0000Eu-I9 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:43 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 38/99-28221-69259065; Mon, 28 Sep 2015 14:45:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1443451540!53733298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23784 invoked from network); 28 Sep 2015 14:45:42 -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; 28 Sep 2015 14:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgS-0001fs-Np for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgS-00034z-M4 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:40 +0000 Date: Mon, 28 Sep 2015 14:45:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xen/arm: vgic: Correctly emulate write when byte is used X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33a04cb2f3f94e594a0cc9dbd0cb077c788ac209 Author: Julien Grall AuthorDate: Tue Sep 22 21:18:48 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 24 11:42:07 2015 +0100 xen/arm: vgic: Correctly emulate write when byte is used When a guest is writing a byte, the value will be located in bits[7:0] of the register. Although the current implementation is expecting the byte at the Nth byte of the register where N = address & 4; When the address is not 4-byte aligned, the corresponding byte in the internal state will always be set to zero rather. Note that byte access are only used for GICD_IPRIORITYR and GICD_ITARGETSR. So the worst things that could happen is not setting the priority correctly and ignore the target vCPU written. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit 3f214fea76acc6cbc1101fe1815cee795483a67d) --- xen/include/asm-arm/vgic.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 41cadb1..96839f0 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -174,10 +174,10 @@ static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) { int byte = offset & 0x3; - var &= (0xff << (8*byte)); + var &= 0xff; *reg &= ~(0xff << (8*byte)); - *reg |= var; + *reg |= (var << (8*byte)); } enum gic_sgi_mode; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgX-0000FA-Aq; Mon, 28 Sep 2015 14:45:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgV-0000Eu-I9 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:43 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 38/99-28221-69259065; Mon, 28 Sep 2015 14:45:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1443451540!53733298!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23784 invoked from network); 28 Sep 2015 14:45:42 -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; 28 Sep 2015 14:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgS-0001fs-Np for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgS-00034z-M4 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:40 +0000 Date: Mon, 28 Sep 2015 14:45:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] xen/arm: vgic: Correctly emulate write when byte is used X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33a04cb2f3f94e594a0cc9dbd0cb077c788ac209 Author: Julien Grall AuthorDate: Tue Sep 22 21:18:48 2015 +0100 Commit: Ian Campbell CommitDate: Thu Sep 24 11:42:07 2015 +0100 xen/arm: vgic: Correctly emulate write when byte is used When a guest is writing a byte, the value will be located in bits[7:0] of the register. Although the current implementation is expecting the byte at the Nth byte of the register where N = address & 4; When the address is not 4-byte aligned, the corresponding byte in the internal state will always be set to zero rather. Note that byte access are only used for GICD_IPRIORITYR and GICD_ITARGETSR. So the worst things that could happen is not setting the priority correctly and ignore the target vCPU written. Signed-off-by: Julien Grall Acked-by: Ian Campbell (cherry picked from commit 3f214fea76acc6cbc1101fe1815cee795483a67d) --- xen/include/asm-arm/vgic.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 41cadb1..96839f0 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -174,10 +174,10 @@ static inline void vgic_byte_write(uint32_t *reg, uint32_t var, int offset) { int byte = offset & 0x3; - var &= (0xff << (8*byte)); + var &= 0xff; *reg &= ~(0xff << (8*byte)); - *reg |= var; + *reg |= (var << (8*byte)); } enum gic_sgi_mode; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgh-0000Gy-DT; Mon, 28 Sep 2015 14:45:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgf-0000Gc-N0 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:53 +0000 Content-Length: 5503 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id FE/BD-32615-1A259065; Mon, 28 Sep 2015 14:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1443451551!38317362!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2478 invoked from network); 28 Sep 2015 14:45:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgd-0001g0-08 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgc-00035T-V3 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:50 +0000 Date: Mon, 28 Sep 2015 14:45:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: fix devd removal path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5874029880947976331==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5874029880947976331== Content-Length: 5172 Content-Transfer-Encoding: quoted-printable commit fe6a5ad304dde6d724e763518296a40aa2ff484e Author: Roger Pau Monne AuthorDate: Wed Sep 23 12:06:55 2015 +0200 Commit: Ian Campbell CommitDate: Thu Sep 24 11:43:31 2015 +0100 libxl: fix devd removal path The current flow of the devd helper (in charge of launching hotplug scripts inside of driver domains) is to wait for the device backend to switch to state 6 (XenbusStateClosed) and then remove it. This is not correct, since a domain can reconnect it's PV devices as many times as it wants. In order to fix this, introduce the following logic: the control domain will set the "online" backend node to 0 when it wants the driver domain to disconnect the device, so now the condition applied in devd is that "state" must be 6 and "online" 0 in order to proceed with the disconnection. Signed-off-by: Roger Pau Monn=C3=A9 Reported-by: Alex Velazquez Cc: Alex Velazquez Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 5c9a00c57172182652c432e80cc278bebc044dc4) --- tools/libxl/libxl.c | 32 ++++++++++++++++++-------------- tools/libxl/libxl_device.c | 9 ++++----- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4d27891..d38d0c7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4421,32 +4421,36 @@ static void backend_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, libxl__ao *nested_ao =3D libxl__nested_ao_create(ddomain->ao); STATE_AO_GC(nested_ao); char *p, *path; - const char *sstate; - int state, rc, num_devs; + const char *sstate, *sonline; + int state, online, rc, num_devs; libxl__device *dev =3D NULL; libxl__ddomain_device *ddev =3D NULL; libxl__ddomain_guest *dguest =3D NULL; bool free_ao =3D false; - /* Check if event_path ends with "state" and truncate it */ - if (strlen(event_path) < strlen("state")) - goto skip; - + /* Check if event_path ends with "state" or "online" and truncate it. */ path =3D libxl__strdup(gc, event_path); - p =3D path + strlen(path) - strlen("state") - 1; - if (*p !=3D '/') + p =3D strrchr(path, '/'); + if (p =3D=3D NULL) goto skip; - *p =3D '\0'; - p++; - if (strcmp(p, "state") !=3D 0) + if (strcmp(p, "/state") !=3D 0 && strcmp(p, "/online") !=3D 0) goto skip; + /* Truncate the string so it points to the backend directory. */ + *p =3D '\0'; - /* Check if the state is 1 (XenbusStateInitialising) or greater */ - rc =3D libxl__xs_read_checked(gc, XBT_NULL, event_path, &sstate); + /* Fetch the value of the state and online nodes. */ + rc =3D libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/state", path), + &sstate); if (rc || !sstate) goto skip; state =3D atoi(sstate); + rc =3D libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/online", path), + &sonline); + if (rc || !sonline) + goto skip; + online =3D atoi(sonline); + dev =3D libxl__zalloc(NOGC, sizeof(*dev)); rc =3D libxl__parse_backend_path(gc, path, dev); if (rc) @@ -4488,7 +4492,7 @@ static void backend_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, rc =3D add_device(egc, nested_ao, dguest, ddev); if (rc > 0) free_ao =3D true; - } else if (state =3D=3D XenbusStateClosed) { + } else if (state =3D=3D XenbusStateClosed && online =3D=3D 0) { /* * Removal of an active device, remove it from the list and * free it's data structures if they are no longer needed. diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index bee5ed5..85a3662 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -837,16 +837,15 @@ void libxl__initiate_device_remove(libxl__egc *egc, goto out; } + rc =3D libxl__xs_write_checked(gc, t, online_path, "0"); + if (rc) + goto out; + /* * Check if device is already in "closed" state, in which case * it should not be changed. */ if (state && atoi(state) !=3D XenbusStateClosed) { - rc =3D libxl__xs_write_checked(gc, t, online_path, "0"); - if (rc) { - LOG(ERROR, "unable to write to xenstore path %s", online_path); - goto out; - } rc =3D libxl__xs_write_checked(gc, t, state_path, GCSPRINTF("%d", XenbusStateClosing)); if (rc) { LOG(ERROR, "unable to write to xenstore path %s", state_path); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 --===============5874029880947976331== 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 --===============5874029880947976331==-- From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:45:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgh-0000Gy-DT; Mon, 28 Sep 2015 14:45:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgf-0000Gc-N0 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:53 +0000 Content-Length: 5503 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id FE/BD-32615-1A259065; Mon, 28 Sep 2015 14:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1443451551!38317362!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2478 invoked from network); 28 Sep 2015 14:45:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgd-0001g0-08 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgc-00035T-V3 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:45:50 +0000 Date: Mon, 28 Sep 2015 14:45:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: fix devd removal path X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5874029880947976331==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5874029880947976331== Content-Length: 5172 Content-Transfer-Encoding: quoted-printable commit fe6a5ad304dde6d724e763518296a40aa2ff484e Author: Roger Pau Monne AuthorDate: Wed Sep 23 12:06:55 2015 +0200 Commit: Ian Campbell CommitDate: Thu Sep 24 11:43:31 2015 +0100 libxl: fix devd removal path The current flow of the devd helper (in charge of launching hotplug scripts inside of driver domains) is to wait for the device backend to switch to state 6 (XenbusStateClosed) and then remove it. This is not correct, since a domain can reconnect it's PV devices as many times as it wants. In order to fix this, introduce the following logic: the control domain will set the "online" backend node to 0 when it wants the driver domain to disconnect the device, so now the condition applied in devd is that "state" must be 6 and "online" 0 in order to proceed with the disconnection. Signed-off-by: Roger Pau Monn=C3=A9 Reported-by: Alex Velazquez Cc: Alex Velazquez Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 5c9a00c57172182652c432e80cc278bebc044dc4) --- tools/libxl/libxl.c | 32 ++++++++++++++++++-------------- tools/libxl/libxl_device.c | 9 ++++----- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 4d27891..d38d0c7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4421,32 +4421,36 @@ static void backend_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, libxl__ao *nested_ao =3D libxl__nested_ao_create(ddomain->ao); STATE_AO_GC(nested_ao); char *p, *path; - const char *sstate; - int state, rc, num_devs; + const char *sstate, *sonline; + int state, online, rc, num_devs; libxl__device *dev =3D NULL; libxl__ddomain_device *ddev =3D NULL; libxl__ddomain_guest *dguest =3D NULL; bool free_ao =3D false; - /* Check if event_path ends with "state" and truncate it */ - if (strlen(event_path) < strlen("state")) - goto skip; - + /* Check if event_path ends with "state" or "online" and truncate it. */ path =3D libxl__strdup(gc, event_path); - p =3D path + strlen(path) - strlen("state") - 1; - if (*p !=3D '/') + p =3D strrchr(path, '/'); + if (p =3D=3D NULL) goto skip; - *p =3D '\0'; - p++; - if (strcmp(p, "state") !=3D 0) + if (strcmp(p, "/state") !=3D 0 && strcmp(p, "/online") !=3D 0) goto skip; + /* Truncate the string so it points to the backend directory. */ + *p =3D '\0'; - /* Check if the state is 1 (XenbusStateInitialising) or greater */ - rc =3D libxl__xs_read_checked(gc, XBT_NULL, event_path, &sstate); + /* Fetch the value of the state and online nodes. */ + rc =3D libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/state", path), + &sstate); if (rc || !sstate) goto skip; state =3D atoi(sstate); + rc =3D libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/online", path), + &sonline); + if (rc || !sonline) + goto skip; + online =3D atoi(sonline); + dev =3D libxl__zalloc(NOGC, sizeof(*dev)); rc =3D libxl__parse_backend_path(gc, path, dev); if (rc) @@ -4488,7 +4492,7 @@ static void backend_watch_callback(libxl__egc *egc, libxl__ev_xswatch *watch, rc =3D add_device(egc, nested_ao, dguest, ddev); if (rc > 0) free_ao =3D true; - } else if (state =3D=3D XenbusStateClosed) { + } else if (state =3D=3D XenbusStateClosed && online =3D=3D 0) { /* * Removal of an active device, remove it from the list and * free it's data structures if they are no longer needed. diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index bee5ed5..85a3662 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -837,16 +837,15 @@ void libxl__initiate_device_remove(libxl__egc *egc, goto out; } + rc =3D libxl__xs_write_checked(gc, t, online_path, "0"); + if (rc) + goto out; + /* * Check if device is already in "closed" state, in which case * it should not be changed. */ if (state && atoi(state) !=3D XenbusStateClosed) { - rc =3D libxl__xs_write_checked(gc, t, online_path, "0"); - if (rc) { - LOG(ERROR, "unable to write to xenstore path %s", online_path); - goto out; - } rc =3D libxl__xs_write_checked(gc, t, state_path, GCSPRINTF("%d", XenbusStateClosing)); if (rc) { LOG(ERROR, "unable to write to xenstore path %s", state_path); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 --===============5874029880947976331== 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 --===============5874029880947976331==-- From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:46:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:46: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 1ZgZgt-0000Jh-GN; Mon, 28 Sep 2015 14:46:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgr-0000JP-P8 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:46:05 +0000 Content-Length: 3156 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 0D/BB-04752-DA259065; Mon, 28 Sep 2015 14:46:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1443451561!20829959!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4119 invoked from network); 28 Sep 2015 14:46:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:46:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgn-0001gb-6C for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:46:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgn-00035w-4J for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:46:01 +0000 Date: Mon, 28 Sep 2015 14:46:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: fix the cleanup of the backend path when using driver domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7507212019581192998==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7507212019581192998== Content-Length: 2764 Content-Transfer-Encoding: quoted-printable commit 7472ced461b4c4480a6dee2753a266f98e791456 Author: Roger Pau Monne AuthorDate: Wed Sep 23 12:06:56 2015 +0200 Commit: Ian Campbell CommitDate: Thu Sep 24 11:43:31 2015 +0100 libxl: fix the cleanup of the backend path when using driver domains With the current libxl implementation the control domain will remove both the frontend and the backend xenstore paths of a device that's handled by a driver domain. This is incorrect, since the driver domain possibly needs to access the backend path in order to perform the disconnection and cleanup of the device. Fix this by making sure the control domain only cleans the frontend path, leaving the backend path to be cleaned by the driver domain. Note that if the device is not handled by a driver domain the control domain will perform the removal of both the frontend and the backend paths. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Ian Jackson Reported-by: Alex Velazquez Cc: Alex Velazquez Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 546678c6a60f64fb186640460dfa69a837c8fba5) --- tools/libxl/libxl_device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 85a3662..8bb5e93 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -591,15 +591,15 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) if (domid =3D=3D LIBXL_TOOLSTACK_DOMID) { /* - * The toolstack domain is in charge for removing both the - * frontend and the backend path + * The toolstack domain is in charge of removing the + * frontend path. */ libxl__xs_path_cleanup(gc, t, fe_path); - libxl__xs_path_cleanup(gc, t, be_path); - } else if (dev->backend_domid =3D=3D domid) { + } + if (dev->backend_domid =3D=3D domid) { /* - * The driver domain is in charge for removing what it can - * from the backend path + * The driver domain is in charge of removing what it can + * from the backend path. */ libxl__xs_path_cleanup(gc, t, be_path); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 --===============7507212019581192998== 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 --===============7507212019581192998==-- From xen-changelog-bounces@lists.xen.org Mon Sep 28 14:46:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 28 Sep 2015 14:46: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 1ZgZgt-0000Jh-GN; Mon, 28 Sep 2015 14:46:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgr-0000JP-P8 for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:46:05 +0000 Content-Length: 3156 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 0D/BB-04752-DA259065; Mon, 28 Sep 2015 14:46:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1443451561!20829959!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.13.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4119 invoked from network); 28 Sep 2015 14:46:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 28 Sep 2015 14:46:02 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZgZgn-0001gb-6C for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:46:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1ZgZgn-00035w-4J for xen-changelog@lists.xensource.com; Mon, 28 Sep 2015 14:46:01 +0000 Date: Mon, 28 Sep 2015 14:46:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: fix the cleanup of the backend path when using driver domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7507212019581192998==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7507212019581192998== Content-Length: 2764 Content-Transfer-Encoding: quoted-printable commit 7472ced461b4c4480a6dee2753a266f98e791456 Author: Roger Pau Monne AuthorDate: Wed Sep 23 12:06:56 2015 +0200 Commit: Ian Campbell CommitDate: Thu Sep 24 11:43:31 2015 +0100 libxl: fix the cleanup of the backend path when using driver domains With the current libxl implementation the control domain will remove both the frontend and the backend xenstore paths of a device that's handled by a driver domain. This is incorrect, since the driver domain possibly needs to access the backend path in order to perform the disconnection and cleanup of the device. Fix this by making sure the control domain only cleans the frontend path, leaving the backend path to be cleaned by the driver domain. Note that if the device is not handled by a driver domain the control domain will perform the removal of both the frontend and the backend paths. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Ian Jackson Reported-by: Alex Velazquez Cc: Alex Velazquez Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell (cherry picked from commit 546678c6a60f64fb186640460dfa69a837c8fba5) --- tools/libxl/libxl_device.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index 85a3662..8bb5e93 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -591,15 +591,15 @@ int libxl__device_destroy(libxl__gc *gc, libxl__device *dev) if (domid =3D=3D LIBXL_TOOLSTACK_DOMID) { /* - * The toolstack domain is in charge for removing both the - * frontend and the backend path + * The toolstack domain is in charge of removing the + * frontend path. */ libxl__xs_path_cleanup(gc, t, fe_path); - libxl__xs_path_cleanup(gc, t, be_path); - } else if (dev->backend_domid =3D=3D domid) { + } + if (dev->backend_domid =3D=3D domid) { /* - * The driver domain is in charge for removing what it can - * from the backend path + * The driver domain is in charge of removing what it can + * from the backend path. */ libxl__xs_path_cleanup(gc, t, be_path); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 --===============7507212019581192998== 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 --===============7507212019581192998==--