| Message ID | 1417622832-5460-4-git-send-email-eric.auger@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Wed, Dec 03, 2014 at 05:07:10PM +0100, Eric Auger wrote: > on arm/arm64 the VGIC is dynamically instantiated and it is useful > to expose its state, especially for irqfd setup. > > This patch defines __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED > and implements kvm_arch_is_virtual_intc_initialized > > Signed-off-by: Eric Auger <eric.auger@linaro.org> > --- > arch/arm/include/asm/kvm_host.h | 6 ++++++ > arch/arm/kvm/arm.c | 5 +++++ > arch/arm64/include/asm/kvm_host.h | 5 +++++ > 3 files changed, 16 insertions(+) > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > index 53036e2..fe2c89b 100644 > --- a/arch/arm/include/asm/kvm_host.h > +++ b/arch/arm/include/asm/kvm_host.h > @@ -27,6 +27,8 @@ > #include <asm/fpstate.h> > #include <kvm/arm_arch_timer.h> > > +#define __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED > + > #if defined(CONFIG_KVM_ARM_MAX_VCPUS) > #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS > #else > @@ -242,4 +244,8 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} > static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} > static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} > > +/* returns true if the vgic dynamic initialization is done*/ > +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm); I feel like this should go in include/linux/kvm_host.h where there's already a description of the function API. > + > + > #endif /* __ARM_KVM_HOST_H__ */ > diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c > index 9e193c8..5309e4b 100644 > --- a/arch/arm/kvm/arm.c > +++ b/arch/arm/kvm/arm.c > @@ -439,6 +439,11 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) > return 0; > } > > +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm) > +{ > + return vgic_initialized(kvm); > +} > + > static void vcpu_pause(struct kvm_vcpu *vcpu) > { > wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu); > diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h > index 2012c4b..5badd30 100644 > --- a/arch/arm64/include/asm/kvm_host.h > +++ b/arch/arm64/include/asm/kvm_host.h > @@ -28,6 +28,8 @@ > #include <asm/kvm_asm.h> > #include <asm/kvm_mmio.h> > > +#define __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED > + > #if defined(CONFIG_KVM_ARM_MAX_VCPUS) > #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS > #else > @@ -254,4 +256,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} > static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} > static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} > > +/* returns true if the vgic dynamic initialization is done*/ > +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm); > + > #endif /* __ARM64_KVM_HOST_H__ */ > -- > 1.9.1 >
On 01/11/2015 10:12 PM, Christoffer Dall wrote: > On Wed, Dec 03, 2014 at 05:07:10PM +0100, Eric Auger wrote: >> on arm/arm64 the VGIC is dynamically instantiated and it is useful >> to expose its state, especially for irqfd setup. >> >> This patch defines __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED >> and implements kvm_arch_is_virtual_intc_initialized >> >> Signed-off-by: Eric Auger <eric.auger@linaro.org> >> --- >> arch/arm/include/asm/kvm_host.h | 6 ++++++ >> arch/arm/kvm/arm.c | 5 +++++ >> arch/arm64/include/asm/kvm_host.h | 5 +++++ >> 3 files changed, 16 insertions(+) >> >> diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h >> index 53036e2..fe2c89b 100644 >> --- a/arch/arm/include/asm/kvm_host.h >> +++ b/arch/arm/include/asm/kvm_host.h >> @@ -27,6 +27,8 @@ >> #include <asm/fpstate.h> >> #include <kvm/arm_arch_timer.h> >> >> +#define __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED >> + >> #if defined(CONFIG_KVM_ARM_MAX_VCPUS) >> #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS >> #else >> @@ -242,4 +244,8 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} >> static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} >> static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} >> >> +/* returns true if the vgic dynamic initialization is done*/ >> +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm); > > I feel like this should go in include/linux/kvm_host.h where there's > already a description of the function API. agreed Eric > >> + >> + >> #endif /* __ARM_KVM_HOST_H__ */ >> diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c >> index 9e193c8..5309e4b 100644 >> --- a/arch/arm/kvm/arm.c >> +++ b/arch/arm/kvm/arm.c >> @@ -439,6 +439,11 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) >> return 0; >> } >> >> +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm) >> +{ >> + return vgic_initialized(kvm); >> +} >> + >> static void vcpu_pause(struct kvm_vcpu *vcpu) >> { >> wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu); >> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h >> index 2012c4b..5badd30 100644 >> --- a/arch/arm64/include/asm/kvm_host.h >> +++ b/arch/arm64/include/asm/kvm_host.h >> @@ -28,6 +28,8 @@ >> #include <asm/kvm_asm.h> >> #include <asm/kvm_mmio.h> >> >> +#define __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED >> + >> #if defined(CONFIG_KVM_ARM_MAX_VCPUS) >> #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS >> #else >> @@ -254,4 +256,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} >> static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} >> static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} >> >> +/* returns true if the vgic dynamic initialization is done*/ >> +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm); >> + >> #endif /* __ARM64_KVM_HOST_H__ */ >> -- >> 1.9.1 >>
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 53036e2..fe2c89b 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -27,6 +27,8 @@ #include <asm/fpstate.h> #include <kvm/arm_arch_timer.h> +#define __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED + #if defined(CONFIG_KVM_ARM_MAX_VCPUS) #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS #else @@ -242,4 +244,8 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} +/* returns true if the vgic dynamic initialization is done*/ +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm); + + #endif /* __ARM_KVM_HOST_H__ */ diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 9e193c8..5309e4b 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -439,6 +439,11 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu) return 0; } +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm) +{ + return vgic_initialized(kvm); +} + static void vcpu_pause(struct kvm_vcpu *vcpu) { wait_queue_head_t *wq = kvm_arch_vcpu_wq(vcpu); diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 2012c4b..5badd30 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -28,6 +28,8 @@ #include <asm/kvm_asm.h> #include <asm/kvm_mmio.h> +#define __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED + #if defined(CONFIG_KVM_ARM_MAX_VCPUS) #define KVM_MAX_VCPUS CONFIG_KVM_ARM_MAX_VCPUS #else @@ -254,4 +256,7 @@ static inline void kvm_arch_sync_events(struct kvm *kvm) {} static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {} static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} +/* returns true if the vgic dynamic initialization is done*/ +bool kvm_arch_is_virtual_intc_initialized(struct kvm *kvm); + #endif /* __ARM64_KVM_HOST_H__ */
on arm/arm64 the VGIC is dynamically instantiated and it is useful to expose its state, especially for irqfd setup. This patch defines __KVM_HAVE_ARCH_VIRTUAL_INTC_INITIALIZED and implements kvm_arch_is_virtual_intc_initialized Signed-off-by: Eric Auger <eric.auger@linaro.org> --- arch/arm/include/asm/kvm_host.h | 6 ++++++ arch/arm/kvm/arm.c | 5 +++++ arch/arm64/include/asm/kvm_host.h | 5 +++++ 3 files changed, 16 insertions(+)