Commit 699f6751 authored by Jacob Pan's avatar Jacob Pan Committed by Thomas Gleixner
Browse files

KVM: VMX: Move posted interrupt descriptor out of VMX code 



To prepare native usage of posted interrupts, move the PID declarations out
of VMX code such that they can be shared.

Signed-off-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarSean Christopherson <seanjc@google.com>
Link: https://lore.kernel.org/r/20240423174114.526704-2-jacob.jun.pan@linux.intel.com
parent ed30a4a5

arch/x86/include/asm/posted_intr.h

0 → 100644
+88 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _X86_POSTED_INTR_H

#define _X86_POSTED_INTR_H



#define POSTED_INTR_ON  0

#define POSTED_INTR_SN  1



#define PID_TABLE_ENTRY_VALID 1



/* Posted-Interrupt Descriptor */

struct pi_desc {

	u32 pir[8];     /* Posted interrupt requested */

	union {

		struct {

				/* bit 256 - Outstanding Notification */

			u16	on	: 1,

				/* bit 257 - Suppress Notification */

				sn	: 1,

				/* bit 271:258 - Reserved */

				rsvd_1	: 14;

				/* bit 279:272 - Notification Vector */

			u8	nv;

				/* bit 287:280 - Reserved */

			u8	rsvd_2;

				/* bit 319:288 - Notification Destination */

			u32	ndst;

		};

		u64 control;

	};

	u32 rsvd[6];

} __aligned(64);



static inline bool pi_test_and_set_on(struct pi_desc *pi_desc)

{

	return test_and_set_bit(POSTED_INTR_ON, (unsigned long *)&pi_desc->control);

}



static inline bool pi_test_and_clear_on(struct pi_desc *pi_desc)

{

	return test_and_clear_bit(POSTED_INTR_ON, (unsigned long *)&pi_desc->control);

}



static inline bool pi_test_and_clear_sn(struct pi_desc *pi_desc)

{

	return test_and_clear_bit(POSTED_INTR_SN, (unsigned long *)&pi_desc->control);

}



static inline bool pi_test_and_set_pir(int vector, struct pi_desc *pi_desc)

{

	return test_and_set_bit(vector, (unsigned long *)pi_desc->pir);

}



static inline bool pi_is_pir_empty(struct pi_desc *pi_desc)

{

	return bitmap_empty((unsigned long *)pi_desc->pir, NR_VECTORS);

}



static inline void pi_set_sn(struct pi_desc *pi_desc)

{

	set_bit(POSTED_INTR_SN, (unsigned long *)&pi_desc->control);

}



static inline void pi_set_on(struct pi_desc *pi_desc)

{

	set_bit(POSTED_INTR_ON, (unsigned long *)&pi_desc->control);

}



static inline void pi_clear_on(struct pi_desc *pi_desc)

{

	clear_bit(POSTED_INTR_ON, (unsigned long *)&pi_desc->control);

}



static inline void pi_clear_sn(struct pi_desc *pi_desc)

{

	clear_bit(POSTED_INTR_SN, (unsigned long *)&pi_desc->control);

}



static inline bool pi_test_on(struct pi_desc *pi_desc)

{

	return test_bit(POSTED_INTR_ON, (unsigned long *)&pi_desc->control);

}



static inline bool pi_test_sn(struct pi_desc *pi_desc)

{

	return test_bit(POSTED_INTR_SN, (unsigned long *)&pi_desc->control);

}



#endif /* _X86_POSTED_INTR_H */

arch/x86/kvm/vmx/posted_intr.h

+1 −92
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __KVM_X86_VMX_POSTED_INTR_H

#define __KVM_X86_VMX_POSTED_INTR_H



#define POSTED_INTR_ON  0

#define POSTED_INTR_SN  1



#define PID_TABLE_ENTRY_VALID 1



/* Posted-Interrupt Descriptor */

struct pi_desc {

	u32 pir[8];     /* Posted interrupt requested */

	union {

		struct {

				/* bit 256 - Outstanding Notification */

			u16	on	: 1,

				/* bit 257 - Suppress Notification */

				sn	: 1,

				/* bit 271:258 - Reserved */

				rsvd_1	: 14;

				/* bit 279:272 - Notification Vector */

			u8	nv;

				/* bit 287:280 - Reserved */

			u8	rsvd_2;

				/* bit 319:288 - Notification Destination */

			u32	ndst;

		};

		u64 control;

	};

	u32 rsvd[6];

} __aligned(64);



static inline bool pi_test_and_set_on(struct pi_desc *pi_desc)

{

	return test_and_set_bit(POSTED_INTR_ON,

			(unsigned long *)&pi_desc->control);

}



static inline bool pi_test_and_clear_on(struct pi_desc *pi_desc)

{

	return test_and_clear_bit(POSTED_INTR_ON,

			(unsigned long *)&pi_desc->control);

}



static inline bool pi_test_and_clear_sn(struct pi_desc *pi_desc)

{

	return test_and_clear_bit(POSTED_INTR_SN,

			(unsigned long *)&pi_desc->control);

}



static inline bool pi_test_and_set_pir(int vector, struct pi_desc *pi_desc)

{

	return test_and_set_bit(vector, (unsigned long *)pi_desc->pir);

}



static inline bool pi_is_pir_empty(struct pi_desc *pi_desc)

{

	return bitmap_empty((unsigned long *)pi_desc->pir, NR_VECTORS);

}



static inline void pi_set_sn(struct pi_desc *pi_desc)

{

	set_bit(POSTED_INTR_SN,

		(unsigned long *)&pi_desc->control);

}



static inline void pi_set_on(struct pi_desc *pi_desc)

{

	set_bit(POSTED_INTR_ON,

		(unsigned long *)&pi_desc->control);

}



static inline void pi_clear_on(struct pi_desc *pi_desc)

{

	clear_bit(POSTED_INTR_ON,

		(unsigned long *)&pi_desc->control);

}



static inline void pi_clear_sn(struct pi_desc *pi_desc)

{

	clear_bit(POSTED_INTR_SN,

		(unsigned long *)&pi_desc->control);

}



static inline bool pi_test_on(struct pi_desc *pi_desc)

{

	return test_bit(POSTED_INTR_ON,

			(unsigned long *)&pi_desc->control);

}



static inline bool pi_test_sn(struct pi_desc *pi_desc)

{

	return test_bit(POSTED_INTR_SN,

			(unsigned long *)&pi_desc->control);

}

#include <asm/posted_intr.h>



void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu);

void vmx_vcpu_pi_put(struct kvm_vcpu *vcpu);

arch/x86/kvm/vmx/vmx.c

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
#include "x86.h"

#include "smm.h"

#include "vmx_onhyperv.h"

#include "posted_intr.h"



MODULE_AUTHOR("Qumranet");

MODULE_LICENSE("GPL");

arch/x86/kvm/vmx/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -7,10 +7,10 @@ 
#include <asm/kvm.h>

#include <asm/intel_pt.h>

#include <asm/perf_event.h>

#include <asm/posted_intr.h>



#include "capabilities.h"

#include "../kvm_cache_regs.h"

#include "posted_intr.h"

#include "vmcs.h"

#include "vmx_ops.h"

#include "../cpuid.h"