[6/7] Rename event_x86.c to event.c and event_arch.h to event.h + minor fixes

Message ID	1454950682-9459-7-git-send-email-czuzu@bitdefender.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <xen-devel-bounces@lists.xen.org> Comment: DomainKeys? See http://domainkeys.sourceforge.net/ DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=bitdefender.com; b=w/IdWOgNCi2Dk7x8h17sD57M4hKfERIvEODNXDJ02qe9SbkLC+1qAcza46vXlSxdRlf7sKLuDjaQh4pOXPbJmyjwa23xgRDayrjp78lrnWsX32jHz01SkugiNl1MNeFT35GNd64U3FIgRXQE1AUxYnGJ70RFlDK801zajqcTiNDh2bUPuvRvffkJVyouH/by/1z+GXJgIL9xgyaH4uPmGRMLJHHNELMbv/9dEpEMlHQPzoFHpgIzdHGDCcbEvRttC8ThxjH06DEXrClJ11BcR8JAv+kMJs7kkeiwDmlZEBhNWme+yavRZ7DznmZWWecVlgARlnyd011M1GxX7flUPQ==; h=Received:Received:Received:Received:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-BitDefender-Scanner:X-BitDefender-Spam:X-BitDefender-SpamStamp:X-BitDefender-CF-Stamp; From: Corneliu ZUZU <czuzu@bitdefender.com> To: xen-devel@lists.xen.org Date: Mon, 8 Feb 2016 18:58:01 +0200 Message-Id: <1454950682-9459-7-git-send-email-czuzu@bitdefender.com> In-Reply-To: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> References: <1454950682-9459-1-git-send-email-czuzu@bitdefender.com> Agent: BitDefender qmail 3.1.4 on smtp02.buh.bitdefender.net, sigver: 7.64434 Dats: 413947, Stamp: 3], Multi: [Enabled, t: (0.000012, 0.013503)], BW: [Enabled, t: (0.000008,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.010349), Flags: 2A917CE3; NN_TP_TAG_HTTP; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.013974)], URL: [Enabled, t: (0.000032)], RTDA: [Enabled, t: (0.035305), Hit: No, Details: v2.3.3; Id: 2m1ghdo.1aaoi9nek.2hocq], total: 0(775) Cc: Kevin Tian <kevin.tian@intel.com>, Tamas K Lengyel <tamas@tklengyel.com>, Keir Fraser <keir@xen.org>, Ian Campbell <ian.campbell@citrix.com>, Razvan Cojocaru <rcojocaru@bitdefender.com>, Jun Nakajima <jun.nakajima@intel.com>, Andrew Cooper <andrew.cooper3@citrix.com>, Stefano Stabellini <stefano.stabellini@citrix.com>, Jan Beulich <jbeulich@suse.com> Subject: [Xen-devel] [PATCH 6/7] Rename event_x86.c to event.c and event_arch.h to event.h + minor fixes Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org

diff --git a/xen/arch/x86/hvm/Makefile b/xen/arch/x86/hvm/Makefile index 15daa09..794e793 100644 --- a/xen/arch/x86/hvm/Makefile +++ b/xen/arch/x86/hvm/Makefile @@ -3,7 +3,7 @@ subdir-y += vmx obj-y += asid.o obj-y += emulate.o -obj-y += event_x86.o +obj-y += event.o obj-y += hpet.o obj-y += hvm.o obj-y += i8254.o diff --git a/xen/arch/x86/hvm/event.c b/xen/arch/x86/hvm/event.c new file mode 100644 index 0000000..3349c34 --- /dev/null +++ b/xen/arch/x86/hvm/event.c @@ -0,0 +1,51 @@ +/* + * arch/x86/hvm/event.c + * + * Arch-specific hardware virtual machine event abstractions. + * + * Copyright (c) 2004, Intel Corporation. + * Copyright (c) 2005, International Business Machines Corporation. + * Copyright (c) 2008, Citrix Systems, Inc. + * Copyright (c) 2016, Bitdefender S.R.L. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; If not, see <http://www.gnu.org/licenses/>. + */ + +#include <xen/hvm/event.h> + +void hvm_event_msr(unsigned int msr, uint64_t value) +{ + struct vcpu *curr = current; + + if ( curr->domain->arch.monitor.mov_to_msr_enabled ) + { + vm_event_request_t req = { + .reason = VM_EVENT_REASON_MOV_TO_MSR, + .vcpu_id = curr->vcpu_id, + .u.mov_to_msr.msr = msr, + .u.mov_to_msr.value = value, + }; + + hvm_event_traps(curr, 1, &req); + } +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/x86/hvm/event_x86.c b/xen/arch/x86/hvm/event_x86.c deleted file mode 100644 index 7b54f18..0000000 --- a/xen/arch/x86/hvm/event_x86.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * arch/x86/hvm/event_x86.c - * - * Arch-specific hardware virtual machine event abstractions. - * - * Copyright (c) 2004, Intel Corporation. - * Copyright (c) 2005, International Business Machines Corporation. - * Copyright (c) 2008, Citrix Systems, Inc. - * Copyright (c) 2016, Bitdefender S.R.L. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see <http://www.gnu.org/licenses/>. - */ - -#include <xen/hvm/event.h> - -void hvm_event_msr(unsigned int msr, uint64_t value) -{ - struct vcpu *curr = current; - - if ( curr->domain->arch.monitor.mov_to_msr_enabled ) - { - vm_event_request_t req = { - .reason = VM_EVENT_REASON_MOV_TO_MSR, - .vcpu_id = curr->vcpu_id, - .u.mov_to_msr.msr = msr, - .u.mov_to_msr.value = value, - }; - - hvm_event_traps(curr, 1, &req); - } -} - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index d90ca10..6a1ec3b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -59,7 +59,7 @@ #include <asm/hvm/cacheattr.h> #include <asm/hvm/trace.h> #include <asm/hvm/nestedhvm.h> -#include <asm/hvm/event_arch.h> +#include <asm/hvm/event.h> #include <asm/hvm/vmx/vmx.h> #include <asm/hvm/svm/svm.h> /* for cpu_has_tsc_ratio */ #include <asm/altp2m.h> diff --git a/xen/common/Makefile b/xen/common/Makefile index 0d76efe..703faa5 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -67,7 +67,7 @@ obj-$(xenoprof) += xenoprof.o obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o tmem_xen.o xlat.o) -subdir-$(CONFIG_X86) += hvm +subdir-y += hvm subdir-$(coverage) += gcov diff --git a/xen/common/hvm/Makefile b/xen/common/hvm/Makefile index 66ae866..12d13b2 100644 --- a/xen/common/hvm/Makefile +++ b/xen/common/hvm/Makefile @@ -1,2 +1,2 @@ obj-y += event.o -obj-y += save.o +obj-$(CONFIG_X86) += save.o diff --git a/xen/common/hvm/event.c b/xen/common/hvm/event.c index 149ea79..d4ce97a 100644 --- a/xen/common/hvm/event.c +++ b/xen/common/hvm/event.c @@ -1,30 +1,30 @@ /* -* xen/common/hvm/event.c -* -* Common hardware virtual machine event abstractions. -* -* Copyright (c) 2004, Intel Corporation. -* Copyright (c) 2005, International Business Machines Corporation. -* Copyright (c) 2008, Citrix Systems, Inc. -* Copyright (c) 2016, Bitdefender S.R.L. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; If not, see <http://www.gnu.org/licenses/>. -*/ + * xen/common/hvm/event.c + * + * Common hardware virtual machine event abstractions. + * + * Copyright (c) 2004, Intel Corporation. + * Copyright (c) 2005, International Business Machines Corporation. + * Copyright (c) 2008, Citrix Systems, Inc. + * Copyright (c) 2016, Bitdefender S.R.L. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; If not, see <http://www.gnu.org/licenses/>. + */ #include <xen/hvm/event.h> #include <xen/vm_event.h> /* for vm_event_# calls */ #include <xen/monitor.h> -#include <asm/hvm/event_arch.h> /* for hvm_event_arch_# calls */ +#include <asm/hvm/event.h> /* for hvm_event_arch_# calls */ #if CONFIG_X86 #include <asm/altp2m.h> #endif diff --git a/xen/include/asm-arm/hvm/event.h b/xen/include/asm-arm/hvm/event.h new file mode 100644 index 0000000..4aa797b --- /dev/null +++ b/xen/include/asm-arm/hvm/event.h @@ -0,0 +1,40 @@ +/* + * include/asm-arm/hvm/event.h + * + * Arch-specific hardware virtual machine event abstractions. + * + * Copyright (c) 2016, Bitdefender S.R.L. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __ASM_ARM_HVM_EVENT_H__ +#define __ASM_ARM_HVM_EVENT_H__ + +static inline +void arch_hvm_event_fill_regs(vm_event_request_t *req) +{ + /* Not supported on ARM. */ +} + +#endif /* __ASM_ARM_HVM_EVENT_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/hvm/event_arch.h b/xen/include/asm-arm/hvm/event_arch.h deleted file mode 100644 index beebca2..0000000 --- a/xen/include/asm-arm/hvm/event_arch.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * include/asm-arm/hvm/event_arch.h - * - * Arch-specific hardware virtual machine event abstractions. - * - * Copyright (c) 2016, Bitdefender S.R.L. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef __ASM_ARM_HVM_EVENT_ARCH_H__ -#define __ASM_ARM_HVM_EVENT_ARCH_H__ - -static inline -void arch_hvm_event_fill_regs(vm_event_request_t *req) -{ - /* Not supported on ARM. */ -} - -#endif /* __ASM_ARM_HVM_EVENT_ARCH_H__ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/asm-x86/hvm/event.h b/xen/include/asm-x86/hvm/event.h new file mode 100644 index 0000000..88a81f0 --- /dev/null +++ b/xen/include/asm-x86/hvm/event.h @@ -0,0 +1,93 @@ +/* + * include/asm-x86/hvm/event.h + * + * Arch-specific hardware virtual machine event abstractions. + * + * Copyright (c) 2016, Bitdefender S.R.L. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef __ASM_X86_HVM_EVENT_H__ +#define __ASM_X86_HVM_EVENT_H__ + +#include <xen/sched.h> +#include <xen/paging.h> +#include <public/vm_event.h> + +static inline +void arch_hvm_event_fill_regs(vm_event_request_t *req) +{ + const struct cpu_user_regs *regs = guest_cpu_user_regs(); + const struct vcpu *curr = current; + + req->data.regs.x86.rax = regs->eax; + req->data.regs.x86.rcx = regs->ecx; + req->data.regs.x86.rdx = regs->edx; + req->data.regs.x86.rbx = regs->ebx; + req->data.regs.x86.rsp = regs->esp; + req->data.regs.x86.rbp = regs->ebp; + req->data.regs.x86.rsi = regs->esi; + req->data.regs.x86.rdi = regs->edi; + + req->data.regs.x86.r8 = regs->r8; + req->data.regs.x86.r9 = regs->r9; + req->data.regs.x86.r10 = regs->r10; + req->data.regs.x86.r11 = regs->r11; + req->data.regs.x86.r12 = regs->r12; + req->data.regs.x86.r13 = regs->r13; + req->data.regs.x86.r14 = regs->r14; + req->data.regs.x86.r15 = regs->r15; + + req->data.regs.x86.rflags = regs->eflags; + req->data.regs.x86.rip = regs->eip; + + req->data.regs.x86.msr_efer = curr->arch.hvm_vcpu.guest_efer; + req->data.regs.x86.cr0 = curr->arch.hvm_vcpu.guest_cr[0]; + req->data.regs.x86.cr3 = curr->arch.hvm_vcpu.guest_cr[3]; + req->data.regs.x86.cr4 = curr->arch.hvm_vcpu.guest_cr[4]; +} + +/* + * Returns the GFN of the given instruction pointer. + * Needed by hvm_event_software_breakpoint. + */ +static inline +uint64_t arch_hvm_event_gfn_of_ip(unsigned long ip) +{ + struct vcpu *curr = current; + struct segment_register sreg; + uint32_t pfec = PFEC_page_present | PFEC_insn_fetch; + + hvm_get_segment_register(curr, x86_seg_ss, &sreg); + if ( 3 == sreg.attr.fields.dpl ) + pfec |= PFEC_user_mode; + + hvm_get_segment_register(curr, x86_seg_cs, &sreg); + + return (uint64_t) paging_gva_to_gfn(curr, sreg.base + ip, &pfec); +} + +void hvm_event_msr(unsigned int msr, uint64_t value); + +#endif /* __ASM_X86_HVM_EVENT_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/hvm/event_arch.h b/xen/include/asm-x86/hvm/event_arch.h deleted file mode 100644 index b9fb559..0000000 --- a/xen/include/asm-x86/hvm/event_arch.h +++ /dev/null @@ -1,93 +0,0 @@ -/* - * include/asm-x86/hvm/event_arch.h - * - * Arch-specific hardware virtual machine event abstractions. - * - * Copyright (c) 2016, Bitdefender S.R.L. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef __ASM_X86_HVM_EVENT_ARCH_H__ -#define __ASM_X86_HVM_EVENT_ARCH_H__ - -#include <xen/sched.h> -#include <xen/paging.h> -#include <public/vm_event.h> - -static inline -void arch_hvm_event_fill_regs(vm_event_request_t *req) -{ - const struct cpu_user_regs *regs = guest_cpu_user_regs(); - const struct vcpu *curr = current; - - req->data.regs.x86.rax = regs->eax; - req->data.regs.x86.rcx = regs->ecx; - req->data.regs.x86.rdx = regs->edx; - req->data.regs.x86.rbx = regs->ebx; - req->data.regs.x86.rsp = regs->esp; - req->data.regs.x86.rbp = regs->ebp; - req->data.regs.x86.rsi = regs->esi; - req->data.regs.x86.rdi = regs->edi; - - req->data.regs.x86.r8 = regs->r8; - req->data.regs.x86.r9 = regs->r9; - req->data.regs.x86.r10 = regs->r10; - req->data.regs.x86.r11 = regs->r11; - req->data.regs.x86.r12 = regs->r12; - req->data.regs.x86.r13 = regs->r13; - req->data.regs.x86.r14 = regs->r14; - req->data.regs.x86.r15 = regs->r15; - - req->data.regs.x86.rflags = regs->eflags; - req->data.regs.x86.rip = regs->eip; - - req->data.regs.x86.msr_efer = curr->arch.hvm_vcpu.guest_efer; - req->data.regs.x86.cr0 = curr->arch.hvm_vcpu.guest_cr[0]; - req->data.regs.x86.cr3 = curr->arch.hvm_vcpu.guest_cr[3]; - req->data.regs.x86.cr4 = curr->arch.hvm_vcpu.guest_cr[4]; -} - -/* - * Returns the GFN of the given instruction pointer. - * Needed by hvm_event_software_breakpoint. - */ -static inline -uint64_t arch_hvm_event_gfn_of_ip(unsigned long ip) -{ - struct vcpu *curr = current; - struct segment_register sreg; - uint32_t pfec = PFEC_page_present | PFEC_insn_fetch; - - hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( 3 == sreg.attr.fields.dpl ) - pfec |= PFEC_user_mode; - - hvm_get_segment_register(curr, x86_seg_cs, &sreg); - - return (uint64_t) paging_gva_to_gfn(curr, sreg.base + ip, &pfec); -} - -void hvm_event_msr(unsigned int msr, uint64_t value); - -#endif /* __ASM_X86_HVM_EVENT_ARCH_H__ */ - -/* - * Local variables: - * mode: C - * c-file-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/xen/include/xen/hvm/event.h b/xen/include/xen/hvm/event.h index 85e63d6..0548945 100644 --- a/xen/include/xen/hvm/event.h +++ b/xen/include/xen/hvm/event.h @@ -27,7 +27,7 @@ #if CONFIG_HAS_VM_EVENT_WRITE_CTRLREG /* - * Called for current VCPU on crX/MSR changes by guest. + * Called for current VCPU on control-register changes by guest. * The event might not fire if the client has subscribed to it in onchangeonly * mode, hence the bool_t return type for control register write events. */ @@ -36,8 +36,8 @@ bool_t hvm_event_cr(unsigned int index, unsigned long old); #if CONFIG_X86 -#define hvm_event_crX(what, new, old) \ - hvm_event_cr(VM_EVENT_X86_##what, new, old) +#define hvm_event_crX(cr, new, old) \ + hvm_event_cr(VM_EVENT_X86_##cr, new, old) #endif #endif // HAS_VM_EVENT_WRITE_CTRLREG

[6/7] Rename event_x86.c to event.c and event_arch.h to event.h + minor fixes

Commit Message

Patch