| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <568E8A4E.305@de.ibm.com>
Date: Thu, 7 Jan 2016 16:54:54 +0100
From: Christian Borntraeger <borntraeger@...ibm.com>
To: Paolo Bonzini <pbonzini@...hat.com>, linux-kernel@...r.kernel.org,
kvm@...r.kernel.org
Cc: Takuya Yoshikawa <yoshikawa_takuya_b1@....ntt.co.jp>,
Paul Mackerras <paulus@...ba.org>
Subject: Re: [PATCH 4/4] KVM: move architecture-dependent requests to arch/
On 01/07/2016 03:17 PM, Paolo Bonzini wrote:
Can you add at least a one line patch description?
> Signed-off-by: Paolo Bonzini <pbonzini@...hat.com>
Reviewed-by: Christian Borntraeger <borntraeger@...ibm.com>
> ---
> arch/powerpc/include/asm/kvm_host.h | 4 ++++
> arch/s390/include/asm/kvm_host.h | 4 ++++
> arch/x86/include/asm/kvm_host.h | 28 +++++++++++++++++++++++++++
> arch/x86/kvm/x86.c | 10 ++++++++++
> include/linux/kvm_host.h | 38 ++-----------------------------------
> virt/kvm/kvm_main.c | 10 ----------
> 6 files changed, 48 insertions(+), 46 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
> index cfa758c6b4f6..271fefbbe521 100644
> --- a/arch/powerpc/include/asm/kvm_host.h
> +++ b/arch/powerpc/include/asm/kvm_host.h
> @@ -50,6 +50,10 @@
> #define KVM_NR_IRQCHIPS 1
> #define KVM_IRQCHIP_NUM_PINS 256
>
> +/* PPC-specific vcpu->requests bit members */
> +#define KVM_REQ_WATCHDOG 8
> +#define KVM_REQ_EPR_EXIT 9
> +
> #include <linux/mmu_notifier.h>
>
> #define KVM_ARCH_WANT_MMU_NOTIFIER
> diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
> index c83144110ea9..31fe20f4d129 100644
> --- a/arch/s390/include/asm/kvm_host.h
> +++ b/arch/s390/include/asm/kvm_host.h
> @@ -39,6 +39,10 @@
> #define KVM_IRQCHIP_NUM_PINS 4096
> #define KVM_HALT_POLL_NS_DEFAULT 0
>
> +/* s390-specific vcpu->requests bit members */
> +#define KVM_REQ_ENABLE_IBS 8
> +#define KVM_REQ_DISABLE_IBS 9
> +
> #define SIGP_CTRL_C 0x80
> #define SIGP_CTRL_SCN_MASK 0x3f
>
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index a7c89876698b..44adbb819041 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -46,6 +46,31 @@
>
> #define KVM_IRQCHIP_NUM_PINS KVM_IOAPIC_NUM_PINS
>
> +/* x86-specific vcpu->requests bit members */
> +#define KVM_REQ_MIGRATE_TIMER 8
> +#define KVM_REQ_REPORT_TPR_ACCESS 9
> +#define KVM_REQ_TRIPLE_FAULT 10
> +#define KVM_REQ_MMU_SYNC 11
> +#define KVM_REQ_CLOCK_UPDATE 12
> +#define KVM_REQ_DEACTIVATE_FPU 13
> +#define KVM_REQ_EVENT 14
> +#define KVM_REQ_APF_HALT 15
> +#define KVM_REQ_STEAL_UPDATE 16
> +#define KVM_REQ_NMI 17
> +#define KVM_REQ_PMU 18
> +#define KVM_REQ_PMI 19
> +#define KVM_REQ_SMI 20
> +#define KVM_REQ_MASTERCLOCK_UPDATE 21
> +#define KVM_REQ_MCLOCK_INPROGRESS 22
> +#define KVM_REQ_SCAN_IOAPIC 23
> +#define KVM_REQ_GLOBAL_CLOCK_UPDATE 24
> +#define KVM_REQ_APIC_PAGE_RELOAD 25
> +#define KVM_REQ_HV_CRASH 26
> +#define KVM_REQ_IOAPIC_EOI_EXIT 27
> +#define KVM_REQ_HV_RESET 28
> +#define KVM_REQ_HV_EXIT 29
> +#define KVM_REQ_HV_STIMER 30
> +
> #define CR0_RESERVED_BITS \
> (~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \
> | X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM \
> @@ -1268,6 +1293,9 @@ u64 kvm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc);
> unsigned long kvm_get_linear_rip(struct kvm_vcpu *vcpu);
> bool kvm_is_linear_rip(struct kvm_vcpu *vcpu, unsigned long linear_rip);
>
> +void kvm_make_mclock_inprogress_request(struct kvm *kvm);
> +void kvm_make_scan_ioapic_request(struct kvm *kvm);
> +
> void kvm_arch_async_page_not_present(struct kvm_vcpu *vcpu,
> struct kvm_async_pf *work);
> void kvm_arch_async_page_present(struct kvm_vcpu *vcpu,
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 102c3028513f..dc6b37f47cd7 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -1686,6 +1686,11 @@ static void pvclock_update_vm_gtod_copy(struct kvm *kvm)
> #endif
> }
>
> +void kvm_make_mclock_inprogress_request(struct kvm *kvm)
> +{
> + kvm_make_all_cpus_request(kvm, KVM_REQ_MCLOCK_INPROGRESS);
> +}
> +
> static void kvm_gen_update_masterclock(struct kvm *kvm)
> {
> #ifdef CONFIG_X86_64
> @@ -6337,6 +6342,11 @@ static void process_smi(struct kvm_vcpu *vcpu)
> kvm_mmu_reset_context(vcpu);
> }
>
> +void kvm_make_scan_ioapic_request(struct kvm *kvm)
> +{
> + kvm_make_all_cpus_request(kvm, KVM_REQ_SCAN_IOAPIC);
> +}
> +
> static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)
> {
> u64 eoi_exit_bitmap[4];
> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> index b0ec0f778192..81c35dff52fd 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -111,46 +111,14 @@ static inline bool is_error_page(struct page *page)
> }
>
> /*
> - * vcpu->requests bit members
> + * Architecture-independent vcpu->requests bit members
> + * Bits 4-7 are reserved for more arch-independent bits.
> */
> #define KVM_REQ_TLB_FLUSH 0
> #define KVM_REQ_MMU_RELOAD 1
> #define KVM_REQ_PENDING_TIMER 2
> #define KVM_REQ_UNHALT 3
>
> -/* x86-specific requests */
> -#define KVM_REQ_MIGRATE_TIMER 8
> -#define KVM_REQ_REPORT_TPR_ACCESS 9
> -#define KVM_REQ_TRIPLE_FAULT 10
> -#define KVM_REQ_MMU_SYNC 11
> -#define KVM_REQ_CLOCK_UPDATE 12
> -#define KVM_REQ_DEACTIVATE_FPU 13
> -#define KVM_REQ_EVENT 14
> -#define KVM_REQ_APF_HALT 15
> -#define KVM_REQ_STEAL_UPDATE 16
> -#define KVM_REQ_NMI 17
> -#define KVM_REQ_PMU 18
> -#define KVM_REQ_PMI 19
> -#define KVM_REQ_SMI 20
> -#define KVM_REQ_MASTERCLOCK_UPDATE 21
> -#define KVM_REQ_MCLOCK_INPROGRESS 22
> -#define KVM_REQ_SCAN_IOAPIC 23
> -#define KVM_REQ_GLOBAL_CLOCK_UPDATE 24
> -#define KVM_REQ_APIC_PAGE_RELOAD 25
> -#define KVM_REQ_HV_CRASH 26
> -#define KVM_REQ_IOAPIC_EOI_EXIT 27
> -#define KVM_REQ_HV_RESET 28
> -#define KVM_REQ_HV_EXIT 29
> -#define KVM_REQ_HV_STIMER 30
> -
> -/* PPC-specific requests */
> -#define KVM_REQ_WATCHDOG 8
> -#define KVM_REQ_EPR_EXIT 9
> -
> -/* s390-specific requests */
> -#define KVM_REQ_ENABLE_IBS 8
> -#define KVM_REQ_DISABLE_IBS 9
> -
> #define KVM_USERSPACE_IRQ_SOURCE_ID 0
> #define KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID 1
>
> @@ -689,8 +657,6 @@ void kvm_put_guest_fpu(struct kvm_vcpu *vcpu);
>
> void kvm_flush_remote_tlbs(struct kvm *kvm);
> void kvm_reload_remote_mmus(struct kvm *kvm);
> -void kvm_make_mclock_inprogress_request(struct kvm *kvm);
> -void kvm_make_scan_ioapic_request(struct kvm *kvm);
> bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req);
>
> long kvm_arch_dev_ioctl(struct file *filp,
> diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> index be3cef12706c..314c7774652e 100644
> --- a/virt/kvm/kvm_main.c
> +++ b/virt/kvm/kvm_main.c
> @@ -206,16 +206,6 @@ void kvm_reload_remote_mmus(struct kvm *kvm)
> kvm_make_all_cpus_request(kvm, KVM_REQ_MMU_RELOAD);
> }
>
> -void kvm_make_mclock_inprogress_request(struct kvm *kvm)
> -{
> - kvm_make_all_cpus_request(kvm, KVM_REQ_MCLOCK_INPROGRESS);
> -}
> -
> -void kvm_make_scan_ioapic_request(struct kvm *kvm)
> -{
> - kvm_make_all_cpus_request(kvm, KVM_REQ_SCAN_IOAPIC);
> -}
> -
> int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id)
> {
> struct page *page;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists