x86/kvm: properly use DEFINE_IDTENTRY_SYSVEC() macro

vittyvk · bonzini · commit 244081f9073f · 2020-09-12T02:22:07.000-04:00
DEFINE_IDTENTRY_SYSVEC() already contains irqentry_enter()/
irqentry_exit().

Signed-off-by: Vitaly Kuznetsov &lt;vkuznets@redhat.com&gt;
Message-Id: &lt;20200908135350.355053-2-vkuznets@redhat.com&gt;
Signed-off-by: Paolo Bonzini &lt;pbonzini@redhat.com&gt;
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
@@ -270,9 +270,6 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_kvm_asyncpf_interrupt)
 {
 	struct pt_regs *old_regs = set_irq_regs(regs);
 	u32 token;
-	irqentry_state_t state;
-
-	state = irqentry_enter(regs);
 
 	inc_irq_stat(irq_hv_callback_count);
 
@@ -283,7 +280,6 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_kvm_asyncpf_interrupt)
 		wrmsrl(MSR_KVM_ASYNC_PF_ACK, 1);
 	}
 
-	irqentry_exit(regs, state);
 	set_irq_regs(old_regs);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -270,9 +270,6 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_kvm_asyncpf_interrupt)`
`270`	`270`	`{`
`271`	`271`	`struct pt_regs *old_regs = set_irq_regs(regs);`
`272`	`272`	`u32 token;`
`273`		`- irqentry_state_t state;`
`274`		`-`
`275`		`- state = irqentry_enter(regs);`
`276`	`273`
`277`	`274`	`inc_irq_stat(irq_hv_callback_count);`
`278`	`275`
`@@ -283,7 +280,6 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_kvm_asyncpf_interrupt)`
`283`	`280`	`wrmsrl(MSR_KVM_ASYNC_PF_ACK, 1);`
`284`	`281`	`}`
`285`	`282`
`286`		`- irqentry_exit(regs, state);`
`287`	`283`	`set_irq_regs(old_regs);`
`288`	`284`	`}`
`289`	`285`