Revert "irqbypass: do not start cons/prod when failed connect"
Subsystems (4)
PATCH 1/1 Revert "irqbypass: do not start cons/prod when failed connect"
This reverts commit a979a6aa009f3c99689432e0cdb5402a4463fb88.
The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
--- virt/lib/irqbypass.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
virt/lib/irqbypass.c +6 -10
@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod,if (prod->add_consumer) ret = prod->add_consumer (prod, cons); -if (ret) - goto err_add_consumer; - - ret = cons->add_producer (cons, prod); -if (ret) - goto err_add_producer; +if (!ret) { + ret = cons->add_producer (cons, prod); +if (ret && prod->del_consumer) + prod->del_consumer (prod, cons); + }if (cons->start) cons->start (cons);if (prod->start) prod->start (prod); -err_add_producer: -if (prod->del_consumer) - prod->del_consumer (prod, cons); -err_add_consumer: +return ret; }
Signature · 1 line
2.27.0
Greg KH
maintainerQuoted 11 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>--- virt/lib/irqbypass.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
<formletter>
This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.
</formletter>
Quoted 6 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
It also unconditionally calls del_consumer on the producer, which isn't exactly expected.
Quoted 2 lines
Signed-off-by Zhu Lingshan <[email protected]>
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Auger Eric
Reviewed-byHi,
Quoted 9 lines · Marc Zyngier
Quoted 6 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Quoted 7 lines
It also unconditionally calls
del_consumeron the producer, which isn't exactly expected.Quoted 2 lines
Signed-off-by Zhu Lingshan <[email protected]>Reported-by Shaokun Zhang <[email protected]>
Thanks
Eric
Quoted 10 lines
Suggested-by Marc Zyngier <[email protected]>Acked-by Marc Zyngier <[email protected]>Fixes a979a6aa009f ("irqbypass: do not start cons/prod when failed connect")Thanks,
M.
Shaokun Zhang
Tested-byHi Marc,
Quoted 9 lines · Marc Zyngier
Quoted 6 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Quoted 7 lines
It also unconditionally calls
del_consumeron the producer, which isn't exactly expected.Quoted 2 lines
Signed-off-by Zhu Lingshan <[email protected]>Reported-by Shaokun Zhang <[email protected]>
Thanks for the tag, it works with this patch, So:
I shall invite you to have a drink for the quick debug. Anyway, thank you again.
Shaokun
Quoted 10 lines
Suggested-by Marc Zyngier <[email protected]>Acked-by Marc Zyngier <[email protected]>Fixes a979a6aa009f ("irqbypass: do not start cons/prod when failed connect")Thanks,
M.
Marc Zyngier
maintainerQuoted 19 lines · Shaokun Zhang
Hi Marc,
Quoted 15 lines · Marc Zyngier
Quoted 6 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
It also unconditionally calls
del_consumeron the producer, which isn't exactly expected.Quoted 2 lines
Signed-off-by Zhu Lingshan <[email protected]>
Quoted 7 lines
Quoted 1 line
Reported-by Shaokun Zhang <[email protected]>Thanks for the tag, it works with this patch, So:
Tested-by Shaokun Zhang <[email protected]>I shall invite you to have a drink for the quick debug. Anyway, thank you again.
No worries, glad we were able to root-cause the problem quickly enough.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Quoted 7 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>
Please resubmit with the formal process of stable (stable-kernel-rules.rst).
Thanks
Quoted 36 lines
--- virt/lib/irqbypass.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)virt/lib/irqbypass.c +6
-10@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod,if (prod->add_consumer) ret = prod->add_consumer (prod, cons); -if (ret) - goto err_add_consumer; - - ret = cons->add_producer (cons, prod); -if (ret) - goto err_add_producer; +if (!ret) { + ret = cons->add_producer (cons, prod); +if (ret && prod->del_consumer) + prod->del_consumer (prod, cons); + }if (cons->start) cons->start (cons);if (prod->start) prod->start (prod); -err_add_producer: -if (prod->del_consumer) - prod->del_consumer (prod, cons); -err_add_consumer: +return ret; }
Quoted 8 lines · Jason Wang
Quoted 6 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Quoted 6 lines
Quoted 1 line
Signed-off-by Zhu Lingshan <[email protected]>Acked-by Jason Wang <[email protected]>Please resubmit with the formal process of stable (
stable-kernel-rules.rst).
sure, I will re-submit it to stable kernel once it is merged into Linus tree.
Thanks
Quoted 39 lines
Thanks
Quoted 34 lines
---
virt/lib/irqbypass.c| 16 ++++++----------1 file changed, 6 insertions(+), 10 deletions(-)virt/lib/irqbypass.c +6
-9@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod, if (prod->add_consumer) ret = prod->add_consumer(prod, cons); - if (ret) - goto err_add_consumer; - - ret = cons->add_producer(cons, prod); - if (ret) - goto err_add_producer; + if (!ret) { + ret = cons->add_producer(cons, prod); + if (ret && prod->del_consumer) + prod->del_consumer(prod, cons); + } if (cons->start) cons->start(cons); if (prod->start) prod->start(prod); -err_add_producer: - if (prod->del_consumer) - prod->del_consumer(prod, cons); -err_add_consumer: + return ret; }
Quoted 14 lines · Lingshan
Quoted 11 lines · Jason Wang
Quoted 7 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>
Quoted 6 lines
Quoted 3 lines
Acked-by Jason Wang <[email protected]>Please resubmit with the formal process of stable (
stable-kernel-rules.rst).sure, I will re-submit it to stable kernel once it is merged into Linus tree.
Thanks
I think it's better to resubmit (option 1), see how stable-kernel-rules.rst said:
""
:ref:option_1 is **strongly** preferred, is the easiest and most common. :ref:option_2 and :ref:option_3 are more useful if the patch isn't deemed worthy at the time it is applied to a public git tree (for instance, because it deserves more regression testing first).
"""
Thanks
Quoted 40 lines
Quoted 39 lines
Thanks
Quoted 34 lines
---
virt/lib/irqbypass.c| 16 ++++++----------1 file changed, 6 insertions(+), 10 deletions(-)virt/lib/irqbypass.c +6
-9@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod, if (prod->add_consumer) ret = prod->add_consumer(prod, cons); - if (ret) - goto err_add_consumer; - - ret = cons->add_producer(cons, prod); - if (ret) - goto err_add_producer; + if (!ret) { + ret = cons->add_producer(cons, prod); + if (ret && prod->del_consumer) + prod->del_consumer(prod, cons); + } if (cons->start) cons->start(cons); if (prod->start) prod->start(prod); -err_add_producer: - if (prod->del_consumer) - prod->del_consumer(prod, cons); -err_add_consumer: + return ret; }
Quoted 28 lines · Jason Wang
Quoted 14 lines · Lingshan
Quoted 11 lines · Jason Wang
Quoted 7 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>Quoted 6 lines
Quoted 3 lines
Acked-by Jason Wang <[email protected]>Please resubmit with the formal process of stable (
stable-kernel-rules.rst).sure, I will re-submit it to stable kernel once it is merged into Linus tree.
Thanks
I think it's better to resubmit (option 1), see how
stable-kernel-rules.rstsaid:""
Quoted 8 lines
:ref:
option_1is **strongly** preferred, is the easiest and most common. :ref:option_2and :ref:option_3are more useful if the patch isn't deemed worthy at the time it is applied to a public git tree (for instance, because it deserves more regression testing first)."""
Thanks
OK, works for me, I will add cc stable, and resubmit it soon
Thanks!
Quoted 43 lines
Quoted 42 lines
Quoted 41 lines
Thanks
Quoted 34 lines
---
virt/lib/irqbypass.c| 16 ++++++----------1 file changed, 6 insertions(+), 10 deletions(-)virt/lib/irqbypass.c +6
-9@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod, if (prod->add_consumer) ret = prod->add_consumer(prod, cons); - if (ret) - goto err_add_consumer; - - ret = cons->add_producer(cons, prod); - if (ret) - goto err_add_producer; + if (!ret) { + ret = cons->add_producer(cons, prod); + if (ret && prod->del_consumer) + prod->del_consumer(prod, cons); + } if (cons->start) cons->start(cons); if (prod->start) prod->start(prod); -err_add_producer: - if (prod->del_consumer) - prod->del_consumer(prod, cons); -err_add_consumer: + return ret; }
Quoted 36 lines · Lingshan
Quoted 33 lines · Jason Wang
Quoted 14 lines · Lingshan
Quoted 11 lines · Jason Wang
Quoted 7 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>Quoted 6 lines
Quoted 3 lines
Acked-by Jason Wang <[email protected]>Please resubmit with the formal process of stable (
stable-kernel-rules.rst).sure, I will re-submit it to stable kernel once it is merged into Linus tree.
Thanks
I think it's better to resubmit (option 1), see how
stable-kernel-rules.rstsaid:""
:ref:
option_1is **strongly** preferred, is the easiest and most common. :ref:option_2and :ref:option_3are more useful if the patch isn't deemed worthy at the time it is applied to a public git tree (for instance, because it deserves more regression testing first).
Quoted 6 lines
Quoted 3 lines
"""
Thanks
OK, works for me, I will add cc stable, and resubmit it soon
Thanks!
I just seeMarc has already added "Cc: [email protected]", and he would take the patch in his tree, so I think no need to resend.
Thanks,
Zhu Lingshan
Quoted 44 lines
Quoted 43 lines
Quoted 42 lines
Quoted 41 lines
Thanks
Quoted 34 lines
---
virt/lib/irqbypass.c| 16 ++++++----------1 file changed, 6 insertions(+), 10 deletions(-)virt/lib/irqbypass.c +6
-9@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod, if (prod->add_consumer) ret = prod->add_consumer(prod, cons); - if (ret) - goto err_add_consumer; - - ret = cons->add_producer(cons, prod); - if (ret) - goto err_add_producer; + if (!ret) { + ret = cons->add_producer(cons, prod); + if (ret && prod->del_consumer) + prod->del_consumer(prod, cons); + } if (cons->start) cons->start(cons); if (prod->start) prod->start(prod); -err_add_producer: - if (prod->del_consumer) - prod->del_consumer(prod, cons); -err_add_consumer: + return ret; }
Marc Zyngier
maintainerQuoted 46 lines · Lingshan
Quoted 42 lines · Lingshan
Quoted 39 lines · Jason Wang
Quoted 14 lines · Lingshan
Quoted 11 lines · Jason Wang
Quoted 7 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>Quoted 8 lines
Quoted 4 lines
Acked-by Jason Wang <[email protected]>Please resubmit with the formal process of stable
(stable-kernel-rules.rst).sure, I will re-submit it to stable kernel once it is merged into Linus tree.
Thanks
I think it's better to resubmit (option 1), see how
stable-kernel-rules.rstsaid:""
:ref:
option_1is **strongly** preferred, is the easiest and most common.
:ref:option_2and :ref:option_3are more useful if the patch isn't deemed
worthy at the time it is applied to a public git tree (for instance, because
it deserves more regression testing first).
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
"""
Thanks
OK, works for me, I will add cc stable, and resubmit it soon
Thanks!
I just seeMarc has already added "Cc: [email protected]", and he would take the patch in his tree, so I think no need to resend.
That's fine, I can fix things up myself and queue the fix for -rc2.
Thanks,
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Quoted 43 lines · Marc Zyngier
Quoted 41 lines · Lingshan
Quoted 38 lines · Lingshan
Quoted 36 lines · Jason Wang
Quoted 11 lines · Lingshan
Quoted 9 lines · Jason Wang
Quoted 7 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>Quoted 8 lines
Quoted 4 lines
Acked-by Jason Wang <[email protected]>Please resubmit with the formal process of stable
(stable-kernel-rules.rst).sure, I will re-submit it to stable kernel once it is merged into Linus tree.
Thanks
I think it's better to resubmit (option 1), see how
stable-kernel-rules.rstsaid:""
:ref:
option_1is **strongly** preferred, is the easiest and most common.
:ref:option_2and :ref:option_3are more useful if the patch isn't deemed
worthy at the time it is applied to a public git tree (for instance, because
it deserves more regression testing first)."""
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Thanks
OK, works for me, I will add cc stable, and resubmit it soon
Thanks!
I just seeMarc has already added "Cc: [email protected]", and he would take the patch in his tree, so I think no need to resend.
That's fine, I can fix things up myself and queue the fix for -rc2.
Thanks Marc!
Quoted 5 lines
Thanks,
M.
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 5 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Applied to fixes, thanks!
[1/1] Revert "irqbypass: do not start cons/prod when failed connect"
commit: 0b1c0157b7b0d66d2d749ec950c7f8799d4a2e0e
Cheers,
M.
Signature · 7 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 7 lines · Zhu Lingshan
This reverts commit
a979a6aa009f3c99689432e0cdb5402a4463fb88.The reverted commit may cause VM freeze on arm64 platform. Because on arm64 platform, stop a consumer will suspend the VM, the VM will freeze without a start consumer
Signed-off-by Zhu Lingshan <[email protected]>
Quoted 38 lines
--- virt/lib/irqbypass.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)virt/lib/irqbypass.c +6
-10@@ -40,21 +40,17 @@ static int __connect(struct irq_bypass_producer *prod,if (prod->add_consumer) ret = prod->add_consumer (prod, cons); -if (ret) - goto err_add_consumer; - - ret = cons->add_producer (cons, prod); -if (ret) - goto err_add_producer; +if (!ret) { + ret = cons->add_producer (cons, prod); +if (ret && prod->del_consumer) + prod->del_consumer (prod, cons); + }if (cons->start) cons->start (cons);if (prod->start) prod->start (prod); -err_add_producer: -if (prod->del_consumer) - prod->del_consumer (prod, cons); -err_add_consumer: +return ret; }Signature · 1 line
2.27.0