* [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice
@ 2018-05-31 7:16 Shannon Zhao
2018-05-31 7:54 ` Auger Eric
2018-05-31 13:56 ` Peter Maydell
0 siblings, 2 replies; 5+ messages in thread
From: Shannon Zhao @ 2018-05-31 7:16 UTC (permalink / raw)
To: qemu-arm; +Cc: peter.maydell, eric.auger, qemu-devel, shannon.zhaosl
kvm_irqchip_create called by kvm_init will call kvm_init_irq_routing to
initialize global capability variables. If we call kvm_init_irq_routing in
GIC realize function, previous allocated memory will leak.
Fix this by deleting the unnecessary call.
Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
---
hw/intc/arm_gic_kvm.c | 1 -
hw/intc/arm_gicv3_kvm.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index 6f467e6..204369d 100644
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -572,7 +572,6 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)
if (kvm_has_gsi_routing()) {
/* set up irq routing */
- kvm_init_irq_routing(kvm_state);
for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
}
diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index 001d82b..aa4c7c5 100644
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -813,7 +813,6 @@ static void kvm_arm_gicv3_realize(DeviceState *dev, Error **errp)
if (kvm_has_gsi_routing()) {
/* set up irq routing */
- kvm_init_irq_routing(kvm_state);
for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
}
--
2.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice
2018-05-31 7:16 [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice Shannon Zhao
@ 2018-05-31 7:54 ` Auger Eric
2018-05-31 8:04 ` Shannon Zhao
2018-05-31 13:56 ` Peter Maydell
1 sibling, 1 reply; 5+ messages in thread
From: Auger Eric @ 2018-05-31 7:54 UTC (permalink / raw)
To: Shannon Zhao, qemu-arm; +Cc: peter.maydell, shannon.zhaosl, qemu-devel
Hi Shannon,
On 05/31/2018 09:16 AM, Shannon Zhao wrote:
> kvm_irqchip_create called by kvm_init will call kvm_init_irq_routing to
> initialize global capability variables. If we call kvm_init_irq_routing in
> GIC realize function, previous allocated memory will leak.
>
> Fix this by deleting the unnecessary call.
>
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
openpic_kvm seems to suffer the same leak. Don't you want to fix it as
well?
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Thanks
Eric
> ---
> hw/intc/arm_gic_kvm.c | 1 -
> hw/intc/arm_gicv3_kvm.c | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
> index 6f467e6..204369d 100644
> --- a/hw/intc/arm_gic_kvm.c
> +++ b/hw/intc/arm_gic_kvm.c
> @@ -572,7 +572,6 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)
>
> if (kvm_has_gsi_routing()) {
> /* set up irq routing */
> - kvm_init_irq_routing(kvm_state);
> for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
> kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
> }
> diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
> index 001d82b..aa4c7c5 100644
> --- a/hw/intc/arm_gicv3_kvm.c
> +++ b/hw/intc/arm_gicv3_kvm.c
> @@ -813,7 +813,6 @@ static void kvm_arm_gicv3_realize(DeviceState *dev, Error **errp)
>
> if (kvm_has_gsi_routing()) {
> /* set up irq routing */
> - kvm_init_irq_routing(kvm_state);
> for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
> kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice
2018-05-31 7:54 ` Auger Eric
@ 2018-05-31 8:04 ` Shannon Zhao
2018-05-31 8:27 ` Auger Eric
0 siblings, 1 reply; 5+ messages in thread
From: Shannon Zhao @ 2018-05-31 8:04 UTC (permalink / raw)
To: Auger Eric, qemu-arm; +Cc: peter.maydell, shannon.zhaosl, qemu-devel
On 2018/5/31 15:54, Auger Eric wrote:
> Hi Shannon,
>
> On 05/31/2018 09:16 AM, Shannon Zhao wrote:
>> kvm_irqchip_create called by kvm_init will call kvm_init_irq_routing to
>> initialize global capability variables. If we call kvm_init_irq_routing in
>> GIC realize function, previous allocated memory will leak.
>>
>> Fix this by deleting the unnecessary call.
>>
>> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
> openpic_kvm seems to suffer the same leak. Don't you want to fix it as
> well?
>
I have a look at below patch of openpic_kvm which says on ppc it doesn't
call kvm_irqchip_create. So no such issue for it.
commit d85937e683f6ff4d68293cb24c780fb1f6820d2c
Author: Scott Wood <scottwood@freescale.com>
Date: Wed Jun 12 15:32:51 2013 -0500
kvm/openpic: in-kernel mpic support
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>
Thanks.
> Thanks
>
> Eric
>> ---
>> hw/intc/arm_gic_kvm.c | 1 -
>> hw/intc/arm_gicv3_kvm.c | 1 -
>> 2 files changed, 2 deletions(-)
>>
>> diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
>> index 6f467e6..204369d 100644
>> --- a/hw/intc/arm_gic_kvm.c
>> +++ b/hw/intc/arm_gic_kvm.c
>> @@ -572,7 +572,6 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)
>>
>> if (kvm_has_gsi_routing()) {
>> /* set up irq routing */
>> - kvm_init_irq_routing(kvm_state);
>> for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
>> kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
>> }
>> diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
>> index 001d82b..aa4c7c5 100644
>> --- a/hw/intc/arm_gicv3_kvm.c
>> +++ b/hw/intc/arm_gicv3_kvm.c
>> @@ -813,7 +813,6 @@ static void kvm_arm_gicv3_realize(DeviceState *dev, Error **errp)
>>
>> if (kvm_has_gsi_routing()) {
>> /* set up irq routing */
>> - kvm_init_irq_routing(kvm_state);
>> for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
>> kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
>> }
>>
>
> .
>
--
Shannon
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice
2018-05-31 8:04 ` Shannon Zhao
@ 2018-05-31 8:27 ` Auger Eric
0 siblings, 0 replies; 5+ messages in thread
From: Auger Eric @ 2018-05-31 8:27 UTC (permalink / raw)
To: Shannon Zhao, qemu-arm; +Cc: peter.maydell, qemu-devel, shannon.zhaosl
Hi Shannon,
On 05/31/2018 10:04 AM, Shannon Zhao wrote:
>
>
> On 2018/5/31 15:54, Auger Eric wrote:
>> Hi Shannon,
>>
>> On 05/31/2018 09:16 AM, Shannon Zhao wrote:
>>> kvm_irqchip_create called by kvm_init will call kvm_init_irq_routing to
>>> initialize global capability variables. If we call kvm_init_irq_routing in
>>> GIC realize function, previous allocated memory will leak.
>>>
>>> Fix this by deleting the unnecessary call.
>>>
>>> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
>> openpic_kvm seems to suffer the same leak. Don't you want to fix it as
>> well?
>>
> I have a look at below patch of openpic_kvm which says on ppc it doesn't
> call kvm_irqchip_create. So no such issue for it.
>
> commit d85937e683f6ff4d68293cb24c780fb1f6820d2c
> Author: Scott Wood <scottwood@freescale.com>
> Date: Wed Jun 12 15:32:51 2013 -0500
>
> kvm/openpic: in-kernel mpic support
Ah OK. Thanks for the pointer.
Eric
>
>> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>>
> Thanks.
>
>> Thanks
>>
>> Eric
>>> ---
>>> hw/intc/arm_gic_kvm.c | 1 -
>>> hw/intc/arm_gicv3_kvm.c | 1 -
>>> 2 files changed, 2 deletions(-)
>>>
>>> diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
>>> index 6f467e6..204369d 100644
>>> --- a/hw/intc/arm_gic_kvm.c
>>> +++ b/hw/intc/arm_gic_kvm.c
>>> @@ -572,7 +572,6 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp)
>>>
>>> if (kvm_has_gsi_routing()) {
>>> /* set up irq routing */
>>> - kvm_init_irq_routing(kvm_state);
>>> for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
>>> kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
>>> }
>>> diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
>>> index 001d82b..aa4c7c5 100644
>>> --- a/hw/intc/arm_gicv3_kvm.c
>>> +++ b/hw/intc/arm_gicv3_kvm.c
>>> @@ -813,7 +813,6 @@ static void kvm_arm_gicv3_realize(DeviceState *dev, Error **errp)
>>>
>>> if (kvm_has_gsi_routing()) {
>>> /* set up irq routing */
>>> - kvm_init_irq_routing(kvm_state);
>>> for (i = 0; i < s->num_irq - GIC_INTERNAL; ++i) {
>>> kvm_irqchip_add_irq_route(kvm_state, i, 0, i);
>>> }
>>>
>>
>> .
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice
2018-05-31 7:16 [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice Shannon Zhao
2018-05-31 7:54 ` Auger Eric
@ 2018-05-31 13:56 ` Peter Maydell
1 sibling, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2018-05-31 13:56 UTC (permalink / raw)
To: Shannon Zhao; +Cc: qemu-arm, Eric Auger, QEMU Developers, Shannon Zhao
On 31 May 2018 at 08:16, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> kvm_irqchip_create called by kvm_init will call kvm_init_irq_routing to
> initialize global capability variables. If we call kvm_init_irq_routing in
> GIC realize function, previous allocated memory will leak.
>
> Fix this by deleting the unnecessary call.
>
> Signed-off-by: Shannon Zhao <zhaoshenglong@huawei.com>
Applied to target-arm.next, thanks.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-05-31 13:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-31 7:16 [Qemu-devel] [PATCH] KVM: GIC: Fix memory leak due to calling kvm_init_irq_routing twice Shannon Zhao
2018-05-31 7:54 ` Auger Eric
2018-05-31 8:04 ` Shannon Zhao
2018-05-31 8:27 ` Auger Eric
2018-05-31 13:56 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).