Patchwork KVM: PPC: BookE: Include trap in pt_regs

login
register
mail settings
Submitter Alexander Graf
Date May 16, 2012, 1:25 p.m.
Message ID <1337174756-6998-1-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/159673/
State New
Headers show

Comments

Alexander Graf - May 16, 2012, 1:25 p.m.
When reinjecting host interrupt requests in the exit handler code,
let's also tell the interrupt handler which interrupt number we're
coming from.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 arch/powerpc/kvm/booke.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
Scott Wood - May 17, 2012, 4:37 p.m.
On 05/16/2012 08:25 AM, Alexander Graf wrote:
> When reinjecting host interrupt requests in the exit handler code,
> let's also tell the interrupt handler which interrupt number we're
> coming from.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>
> ---
>  arch/powerpc/kvm/booke.c |   12 +++++++-----
>  1 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
> index 72f13f4..0512bd7 100644
> --- a/arch/powerpc/kvm/booke.c
> +++ b/arch/powerpc/kvm/booke.c
> @@ -596,7 +596,8 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
>  	}
>  }
>  
> -static void kvmppc_fill_pt_regs(struct pt_regs *regs)
> +static void kvmppc_fill_pt_regs(struct pt_regs *regs,
> +				int exit_nr)
>  {
>  	ulong r1, ip, msr, lr;
>  
> @@ -610,6 +611,7 @@ static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>  	regs->nip = ip;
>  	regs->msr = msr;
>  	regs->link = lr;
> +	regs->trap = exit_nr;
>  }
>  
>  static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
> @@ -619,16 +621,16 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>  
>  	switch (exit_nr) {
>  	case BOOKE_INTERRUPT_EXTERNAL:
> -		kvmppc_fill_pt_regs(&regs);
> +		kvmppc_fill_pt_regs(&regs, exit_nr);
>  		do_IRQ(&regs);
>  		break;

exit_nr is not the same as the trap number that the rest of the kernel
wants to see.

-Scott

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - May 17, 2012, 8:56 p.m.
On 17.05.2012, at 18:37, Scott Wood wrote:

> On 05/16/2012 08:25 AM, Alexander Graf wrote:
>> When reinjecting host interrupt requests in the exit handler code,
>> let's also tell the interrupt handler which interrupt number we're
>> coming from.
>> 
>> Signed-off-by: Alexander Graf <agraf@suse.de>
>> ---
>> arch/powerpc/kvm/booke.c |   12 +++++++-----
>> 1 files changed, 7 insertions(+), 5 deletions(-)
>> 
>> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
>> index 72f13f4..0512bd7 100644
>> --- a/arch/powerpc/kvm/booke.c
>> +++ b/arch/powerpc/kvm/booke.c
>> @@ -596,7 +596,8 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
>> 	}
>> }
>> 
>> -static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>> +static void kvmppc_fill_pt_regs(struct pt_regs *regs,
>> +				int exit_nr)
>> {
>> 	ulong r1, ip, msr, lr;
>> 
>> @@ -610,6 +611,7 @@ static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>> 	regs->nip = ip;
>> 	regs->msr = msr;
>> 	regs->link = lr;
>> +	regs->trap = exit_nr;
>> }
>> 
>> static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>> @@ -619,16 +621,16 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>> 
>> 	switch (exit_nr) {
>> 	case BOOKE_INTERRUPT_EXTERNAL:
>> -		kvmppc_fill_pt_regs(&regs);
>> +		kvmppc_fill_pt_regs(&regs, exit_nr);
>> 		do_IRQ(&regs);
>> 		break;
> 
> exit_nr is not the same as the trap number that the rest of the kernel
> wants to see.

It's not? What does the kernel want to see then?


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Scott Wood - May 17, 2012, 8:58 p.m.
On 05/17/2012 03:56 PM, Alexander Graf wrote:
> 
> On 17.05.2012, at 18:37, Scott Wood wrote:
> 
>> On 05/16/2012 08:25 AM, Alexander Graf wrote:
>>> When reinjecting host interrupt requests in the exit handler code,
>>> let's also tell the interrupt handler which interrupt number we're
>>> coming from.
>>>
>>> Signed-off-by: Alexander Graf <agraf@suse.de>
>>> ---
>>> arch/powerpc/kvm/booke.c |   12 +++++++-----
>>> 1 files changed, 7 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
>>> index 72f13f4..0512bd7 100644
>>> --- a/arch/powerpc/kvm/booke.c
>>> +++ b/arch/powerpc/kvm/booke.c
>>> @@ -596,7 +596,8 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
>>> 	}
>>> }
>>>
>>> -static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>>> +static void kvmppc_fill_pt_regs(struct pt_regs *regs,
>>> +				int exit_nr)
>>> {
>>> 	ulong r1, ip, msr, lr;
>>>
>>> @@ -610,6 +611,7 @@ static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>>> 	regs->nip = ip;
>>> 	regs->msr = msr;
>>> 	regs->link = lr;
>>> +	regs->trap = exit_nr;
>>> }
>>>
>>> static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>>> @@ -619,16 +621,16 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>>>
>>> 	switch (exit_nr) {
>>> 	case BOOKE_INTERRUPT_EXTERNAL:
>>> -		kvmppc_fill_pt_regs(&regs);
>>> +		kvmppc_fill_pt_regs(&regs, exit_nr);
>>> 		do_IRQ(&regs);
>>> 		break;
>>
>> exit_nr is not the same as the trap number that the rest of the kernel
>> wants to see.
> 
> It's not? What does the kernel want to see then?

Remember the commit message in the e500mc patchset about an
undocumented, unnamed mess of magic numbers?

-Scott

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf - May 17, 2012, 9:03 p.m.
On 17.05.2012, at 22:58, Scott Wood wrote:

> On 05/17/2012 03:56 PM, Alexander Graf wrote:
>> 
>> On 17.05.2012, at 18:37, Scott Wood wrote:
>> 
>>> On 05/16/2012 08:25 AM, Alexander Graf wrote:
>>>> When reinjecting host interrupt requests in the exit handler code,
>>>> let's also tell the interrupt handler which interrupt number we're
>>>> coming from.
>>>> 
>>>> Signed-off-by: Alexander Graf <agraf@suse.de>
>>>> ---
>>>> arch/powerpc/kvm/booke.c |   12 +++++++-----
>>>> 1 files changed, 7 insertions(+), 5 deletions(-)
>>>> 
>>>> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
>>>> index 72f13f4..0512bd7 100644
>>>> --- a/arch/powerpc/kvm/booke.c
>>>> +++ b/arch/powerpc/kvm/booke.c
>>>> @@ -596,7 +596,8 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
>>>> 	}
>>>> }
>>>> 
>>>> -static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>>>> +static void kvmppc_fill_pt_regs(struct pt_regs *regs,
>>>> +				int exit_nr)
>>>> {
>>>> 	ulong r1, ip, msr, lr;
>>>> 
>>>> @@ -610,6 +611,7 @@ static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>>>> 	regs->nip = ip;
>>>> 	regs->msr = msr;
>>>> 	regs->link = lr;
>>>> +	regs->trap = exit_nr;
>>>> }
>>>> 
>>>> static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>>>> @@ -619,16 +621,16 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>>>> 
>>>> 	switch (exit_nr) {
>>>> 	case BOOKE_INTERRUPT_EXTERNAL:
>>>> -		kvmppc_fill_pt_regs(&regs);
>>>> +		kvmppc_fill_pt_regs(&regs, exit_nr);
>>>> 		do_IRQ(&regs);
>>>> 		break;
>>> 
>>> exit_nr is not the same as the trap number that the rest of the kernel
>>> wants to see.
>> 
>> It's not? What does the kernel want to see then?
> 
> Remember the commit message in the e500mc patchset about an
> undocumented, unnamed mess of magic numbers?

Yeah. So in KVM we're using the IVOR numbers, right? Any reason we can't do the same for the generic handler? That should simplify the code significantly, no?

I guess I should've checked on this a bit deeper - book3s does the above already :).


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Scott Wood - May 17, 2012, 9:08 p.m.
On 05/17/2012 04:03 PM, Alexander Graf wrote:
> 
> On 17.05.2012, at 22:58, Scott Wood wrote:
> 
>> On 05/17/2012 03:56 PM, Alexander Graf wrote:
>>>
>>> On 17.05.2012, at 18:37, Scott Wood wrote:
>>>
>>>> On 05/16/2012 08:25 AM, Alexander Graf wrote:
>>>>> When reinjecting host interrupt requests in the exit handler code,
>>>>> let's also tell the interrupt handler which interrupt number we're
>>>>> coming from.
>>>>>
>>>>> Signed-off-by: Alexander Graf <agraf@suse.de>
>>>>> ---
>>>>> arch/powerpc/kvm/booke.c |   12 +++++++-----
>>>>> 1 files changed, 7 insertions(+), 5 deletions(-)
>>>>>
>>>>> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
>>>>> index 72f13f4..0512bd7 100644
>>>>> --- a/arch/powerpc/kvm/booke.c
>>>>> +++ b/arch/powerpc/kvm/booke.c
>>>>> @@ -596,7 +596,8 @@ static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
>>>>> 	}
>>>>> }
>>>>>
>>>>> -static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>>>>> +static void kvmppc_fill_pt_regs(struct pt_regs *regs,
>>>>> +				int exit_nr)
>>>>> {
>>>>> 	ulong r1, ip, msr, lr;
>>>>>
>>>>> @@ -610,6 +611,7 @@ static void kvmppc_fill_pt_regs(struct pt_regs *regs)
>>>>> 	regs->nip = ip;
>>>>> 	regs->msr = msr;
>>>>> 	regs->link = lr;
>>>>> +	regs->trap = exit_nr;
>>>>> }
>>>>>
>>>>> static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>>>>> @@ -619,16 +621,16 @@ static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
>>>>>
>>>>> 	switch (exit_nr) {
>>>>> 	case BOOKE_INTERRUPT_EXTERNAL:
>>>>> -		kvmppc_fill_pt_regs(&regs);
>>>>> +		kvmppc_fill_pt_regs(&regs, exit_nr);
>>>>> 		do_IRQ(&regs);
>>>>> 		break;
>>>>
>>>> exit_nr is not the same as the trap number that the rest of the kernel
>>>> wants to see.
>>>
>>> It's not? What does the kernel want to see then?
>>
>> Remember the commit message in the e500mc patchset about an
>> undocumented, unnamed mess of magic numbers?
> 
> Yeah. So in KVM we're using the IVOR numbers, right? Any reason we can't do the same for the generic handler? That should simplify the code significantly, no?

Yeah, I had that as a FIXME on the original patch.  You just need to
make sure all users are updated, which is more difficult due to the fact
that they're just numbers and not symbolic names.

-Scott

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 72f13f4..0512bd7 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -596,7 +596,8 @@  static int emulation_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
 	}
 }
 
-static void kvmppc_fill_pt_regs(struct pt_regs *regs)
+static void kvmppc_fill_pt_regs(struct pt_regs *regs,
+				int exit_nr)
 {
 	ulong r1, ip, msr, lr;
 
@@ -610,6 +611,7 @@  static void kvmppc_fill_pt_regs(struct pt_regs *regs)
 	regs->nip = ip;
 	regs->msr = msr;
 	regs->link = lr;
+	regs->trap = exit_nr;
 }
 
 static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
@@ -619,16 +621,16 @@  static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
 
 	switch (exit_nr) {
 	case BOOKE_INTERRUPT_EXTERNAL:
-		kvmppc_fill_pt_regs(&regs);
+		kvmppc_fill_pt_regs(&regs, exit_nr);
 		do_IRQ(&regs);
 		break;
 	case BOOKE_INTERRUPT_DECREMENTER:
-		kvmppc_fill_pt_regs(&regs);
+		kvmppc_fill_pt_regs(&regs, exit_nr);
 		timer_interrupt(&regs);
 		break;
 #if defined(CONFIG_PPC_FSL_BOOK3E) || defined(CONFIG_PPC_BOOK3E_64)
 	case BOOKE_INTERRUPT_DOORBELL:
-		kvmppc_fill_pt_regs(&regs);
+		kvmppc_fill_pt_regs(&regs, exit_nr);
 		doorbell_exception(&regs);
 		break;
 #endif
@@ -636,7 +638,7 @@  static void kvmppc_restart_interrupt(struct kvm_vcpu *vcpu,
 		/* FIXME */
 		break;
 	case BOOKE_INTERRUPT_PERFORMANCE_MONITOR:
-		kvmppc_fill_pt_regs(&regs);
+		kvmppc_fill_pt_regs(&regs, exit_nr);
 		performance_monitor_exception(&regs);
 		break;
 	}