2020-06-09 02:09:00

by Sean Christopherson

Subject: [PATCH] KVM: VMX: Add helpers to identify interrupt type from intr_info

Add is_intr_type() and is_intr_type_n() to consolidate the boilerplate
code for querying a specific type of interrupt given an encoded value
from VMCS.VM_{ENTER,EXIT}_INTR_INFO, with and without an associated
vector respectively.

Signed-off-by: Sean Christopherson <[email protected]>
---

I wrote and proposed a version of this patch a while back[*], but AFAICT
never posted it as a formal patch.

[*] https://lkml.kernel.org/r/[email protected]

arch/x86/kvm/vmx/vmcs.h | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/arch/x86/kvm/vmx/vmcs.h b/arch/x86/kvm/vmx/vmcs.h
index 5c0ff80b85c0..7a3675fddec2 100644
--- a/arch/x86/kvm/vmx/vmcs.h
+++ b/arch/x86/kvm/vmx/vmcs.h
@@ -72,11 +72,24 @@ struct loaded_vmcs {
struct vmcs_controls_shadow controls_shadow;
};

+static inline bool is_intr_type(u32 intr_info, u32 type)
+{
+ const u32 mask = INTR_INFO_VALID_MASK | INTR_INFO_INTR_TYPE_MASK;
+
+ return (intr_info & mask) == (INTR_INFO_VALID_MASK | type);
+}
+
+static inline bool is_intr_type_n(u32 intr_info, u32 type, u8 vector)
+{
+ const u32 mask = INTR_INFO_VALID_MASK | INTR_INFO_INTR_TYPE_MASK |
+ INTR_INFO_VECTOR_MASK;
+
+ return (intr_info & mask) == (INTR_INFO_VALID_MASK | type | vector);
+}
+
static inline bool is_exception_n(u32 intr_info, u8 vector)
{
- return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
- INTR_INFO_VALID_MASK)) ==
- (INTR_TYPE_HARD_EXCEPTION | vector | INTR_INFO_VALID_MASK);
+ return is_intr_type_n(intr_info, INTR_TYPE_HARD_EXCEPTION, vector);
}

static inline bool is_debug(u32 intr_info)
@@ -106,28 +119,23 @@ static inline bool is_gp_fault(u32 intr_info)

static inline bool is_machine_check(u32 intr_info)
{
- return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
- INTR_INFO_VALID_MASK)) ==
- (INTR_TYPE_HARD_EXCEPTION | MC_VECTOR | INTR_INFO_VALID_MASK);
+ return is_exception_n(intr_info, MC_VECTOR);
}

/* Undocumented: icebp/int1 */
static inline bool is_icebp(u32 intr_info)
{
- return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
- == (INTR_TYPE_PRIV_SW_EXCEPTION | INTR_INFO_VALID_MASK);
+ return is_intr_type(intr_info, INTR_TYPE_PRIV_SW_EXCEPTION);
}

static inline bool is_nmi(u32 intr_info)
{
- return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
- == (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK);
+ return is_intr_type(intr_info, INTR_TYPE_NMI_INTR);
}

static inline bool is_external_intr(u32 intr_info)
{
- return (intr_info & (INTR_INFO_VALID_MASK | INTR_INFO_INTR_TYPE_MASK))
- == (INTR_INFO_VALID_MASK | INTR_TYPE_EXT_INTR);
+ return is_intr_type(intr_info, INTR_TYPE_EXT_INTR);
}

enum vmcs_field_width {
--
2.26.0

2020-06-15 16:15:34

by Paolo Bonzini

Subject: Re: [PATCH] KVM: VMX: Add helpers to identify interrupt type from intr_info

On 09/06/20 03:45, Sean Christopherson wrote:
> Add is_intr_type() and is_intr_type_n() to consolidate the boilerplate
> code for querying a specific type of interrupt given an encoded value
> from VMCS.VM_{ENTER,EXIT}_INTR_INFO, with and without an associated
> vector respectively.
>
> Signed-off-by: Sean Christopherson <[email protected]>
> ---
>
> I wrote and proposed a version of this patch a while back[*], but AFAICT
> never posted it as a formal patch.
>
> [*] https://lkml.kernel.org/r/[email protected]
>
> arch/x86/kvm/vmx/vmcs.h | 32 ++++++++++++++++++++------------
> 1 file changed, 20 insertions(+), 12 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/vmcs.h b/arch/x86/kvm/vmx/vmcs.h
> index 5c0ff80b85c0..7a3675fddec2 100644
> --- a/arch/x86/kvm/vmx/vmcs.h
> +++ b/arch/x86/kvm/vmx/vmcs.h
> @@ -72,11 +72,24 @@ struct loaded_vmcs {
> struct vmcs_controls_shadow controls_shadow;
> };
>
> +static inline bool is_intr_type(u32 intr_info, u32 type)
> +{
> + const u32 mask = INTR_INFO_VALID_MASK | INTR_INFO_INTR_TYPE_MASK;
> +
> + return (intr_info & mask) == (INTR_INFO_VALID_MASK | type);
> +}
> +
> +static inline bool is_intr_type_n(u32 intr_info, u32 type, u8 vector)
> +{
> + const u32 mask = INTR_INFO_VALID_MASK | INTR_INFO_INTR_TYPE_MASK |
> + INTR_INFO_VECTOR_MASK;
> +
> + return (intr_info & mask) == (INTR_INFO_VALID_MASK | type | vector);
> +}
> +
> static inline bool is_exception_n(u32 intr_info, u8 vector)
> {
> - return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
> - INTR_INFO_VALID_MASK)) ==
> - (INTR_TYPE_HARD_EXCEPTION | vector | INTR_INFO_VALID_MASK);
> + return is_intr_type_n(intr_info, INTR_TYPE_HARD_EXCEPTION, vector);
> }
>
> static inline bool is_debug(u32 intr_info)
> @@ -106,28 +119,23 @@ static inline bool is_gp_fault(u32 intr_info)
>
> static inline bool is_machine_check(u32 intr_info)
> {
> - return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VECTOR_MASK |
> - INTR_INFO_VALID_MASK)) ==
> - (INTR_TYPE_HARD_EXCEPTION | MC_VECTOR | INTR_INFO_VALID_MASK);
> + return is_exception_n(intr_info, MC_VECTOR);
> }
>
> /* Undocumented: icebp/int1 */
> static inline bool is_icebp(u32 intr_info)
> {
> - return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
> - == (INTR_TYPE_PRIV_SW_EXCEPTION | INTR_INFO_VALID_MASK);
> + return is_intr_type(intr_info, INTR_TYPE_PRIV_SW_EXCEPTION);
> }
>
> static inline bool is_nmi(u32 intr_info)
> {
> - return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
> - == (INTR_TYPE_NMI_INTR | INTR_INFO_VALID_MASK);
> + return is_intr_type(intr_info, INTR_TYPE_NMI_INTR);
> }
>
> static inline bool is_external_intr(u32 intr_info)
> {
> - return (intr_info & (INTR_INFO_VALID_MASK | INTR_INFO_INTR_TYPE_MASK))
> - == (INTR_INFO_VALID_MASK | INTR_TYPE_EXT_INTR);
> + return is_intr_type(intr_info, INTR_TYPE_EXT_INTR);
> }
>
> enum vmcs_field_width {
>

Queued, thnkas.

Paolo