] xen-netback: fix refcnt unbalance for 3.11 and earlier versions
Subsystems (3)
PATCH 1/1 ] xen-netback: fix refcnt unbalance for 3.11 and earlier versions
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id 279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset of vif->tx_irq was lost. If frontend goes through vif life cycle more than once the reference counting is skewed.
This patch adds back the missing tx_irq reset line. It also moves several lines of the reference counting code to vif_free, so the moved code corresponds to the counterpart in vif_alloc, thus the reference counting is balanced.
3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
This pacth should be backported to all stable verions which are lower than 3.12 and have 279f438e36.
--- drivers/net/xen-netback/interface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/xen-netback/interface.c +4 -3
@@ -418,9 +418,6 @@ void xenvif_disconnect(struct xenvif *vif)if (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -if (vif->tx_irq) {if (vif->tx_irq == vif->rx_irq)unbind_from_irqhandler (vif->tx_irq, vif);
@@ -428,6 +425,7 @@ void xenvif_disconnect(struct xenvif *vif)unbind_from_irqhandler (vif->tx_irq, vif);unbind_from_irqhandler (vif->rx_irq, vif); } + vif->tx_irq =0 ; }xen_netbk_unmap_frontend_rings (vif);
@@ -435,6 +433,9 @@ void xenvif_disconnect(struct xenvif *vif)void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);
Signature · 1 line
1.7.10.4
Quoted 11 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Is this a requirement of the bugfix or just to make reasoning about things easier?
Quoted 8 lines
3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.Reported-and-tested-by Tomasz Wroblewski <[email protected]>Signed-off-by Wei Liu <[email protected]>
Quoted 38 lines
Cc Konrad Wilk <[email protected]>Cc David Vrabel <[email protected]>--- drivers/net/xen-netback/interface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/net/xen-netback/interface.c +4
-3@@ -418,9 +418,6 @@ void xenvif_disconnect(struct xenvif *vif)if (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -if (vif->tx_irq) {if (vif->tx_irq == vif->rx_irq)unbind_from_irqhandler (vif->tx_irq, vif);@@ -428,6 +425,7 @@ void xenvif_disconnect(struct xenvif *vif)unbind_from_irqhandler (vif->tx_irq, vif);unbind_from_irqhandler (vif->rx_irq, vif); } + vif->tx_irq =0 ; }xen_netbk_unmap_frontend_rings (vif);@@ -435,6 +433,9 @@ void xenvif_disconnect(struct xenvif *vif)void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);
Quoted 8 lines · Ian Campbell
Quoted 7 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.
Quoted 8 lines
Quoted 4 lines
This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.Is this a requirement of the bugfix or just to make reasoning about things easier?
The latter.
Wei.
From: Wei Liu <[email protected]>
Date: Thu, 28 Nov 2013 13:13:46 +0000
Quoted 14 lines · Ian Campbell
Quoted 13 lines · Wei Liu
Quoted 11 lines
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Quoted 5 lines
Quoted 3 lines
Is this a requirement of the bugfix or just to make reasoning about things easier?
The latter.
I've queued this up for -stable, thanks.
From: Wei Liu <[email protected]>
Date: Thu, 28 Nov 2013 13:13:46 +0000
Quoted 14 lines · Ian Campbell
Quoted 13 lines · Wei Liu
Quoted 11 lines
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Quoted 5 lines
Quoted 3 lines
Is this a requirement of the bugfix or just to make reasoning about things easier?
The latter.
I've queued this up for -stable, thanks.
Quoted 8 lines · Ian Campbell
Quoted 7 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.
Quoted 8 lines
Quoted 4 lines
This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.Is this a requirement of the bugfix or just to make reasoning about things easier?
The latter.
Wei.
Quoted 11 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Is this a requirement of the bugfix or just to make reasoning about things easier?
Quoted 8 lines
3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.Reported-and-tested-by Tomasz Wroblewski <[email protected]>Signed-off-by Wei Liu <[email protected]>
Quoted 38 lines
Cc Konrad Wilk <[email protected]>Cc David Vrabel <[email protected]>--- drivers/net/xen-netback/interface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/net/xen-netback/interface.c +4
-3@@ -418,9 +418,6 @@ void xenvif_disconnect(struct xenvif *vif)if (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -if (vif->tx_irq) {if (vif->tx_irq == vif->rx_irq)unbind_from_irqhandler (vif->tx_irq, vif);@@ -428,6 +425,7 @@ void xenvif_disconnect(struct xenvif *vif)unbind_from_irqhandler (vif->tx_irq, vif);unbind_from_irqhandler (vif->rx_irq, vif); } + vif->tx_irq =0 ; }xen_netbk_unmap_frontend_rings (vif);@@ -435,6 +433,9 @@ void xenvif_disconnect(struct xenvif *vif)void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);
Quoted 12 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Quoted 5 lines
3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.
What stable versions are those? 279f438e36 showed up in 3.12-rc2, and was not marked for stable inclusion, so what kernel would end up needing this patch?
confused,
greg k-h
Quoted 16 lines · Greg KH
Quoted 15 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
Quoted 7 lines
Quoted 2 lines
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.What stable versions are those?
279f438e36showed up in 3.12-rc2, and was not marked for stable inclusion, so what kernel would end up needing this patch?
Greg,
279f438e36 was backported to at least stable branches
3.11.y: <[email protected]> commit id f495ddc46 3.10.y: <[email protected]> commit id a4626bf64
So at least those two need this patch.
And I remeber 3.8.y.z extended stable branch maintained by Kamal also has the said commit.
Quoted 2 lines
confused,
Sorry, I should've stated cleared all versions.
BTW the above patch applies to 3.11.y. I can provide backports to 3.10.y as well, if necessary.
Wei.
Quoted 1 line
greg k-h
Quoted 37 lines · Wei Liu
Quoted 16 lines · Greg KH
Quoted 15 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
Quoted 7 lines
Quoted 2 lines
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.What stable versions are those?
279f438e36showed up in 3.12-rc2, and was not marked for stable inclusion, so what kernel would end up needing this patch?Greg,
279f438e36was backported to at least stable branches3.11.y: <[email protected]> commit id
f495ddc463.10.y: <[email protected]> commit ida4626bf64So at least those two need this patch.
And I remeber 3.8.y.z extended stable branch maintained by Kamal also has the said commit.
Quoted 7 lines
Quoted 2 lines
confused,
Sorry, I should've stated cleared all versions.
BTW the above patch applies to 3.11.y. I can provide backports to 3.10.y as well, if necessary.
As 3.11.y is now dead, there's not much I can do with that one, but I could use a backport for 3.10.y, as this patch does not apply there, thanks.
greg k-h
Wei Liu
Acked-by Ian CampbellOn Mon, Dec 02, 2013 at 09:19:58AM -0800, Greg KH wrote:
[...]
Quoted 4 lines
As 3.11.y is now dead, there's not much I can do with that one, but I could use a backport for 3.10.y, as this patch does not apply there, thanks.
Here it is.
---8<---
Quoted 1 line
From
f92adc90042cb725cf6351141f52e9fc71639a89Mon Sep 17 00:00:00 2001
From: Wei Liu <[email protected]>
Date: Mon, 2 Dec 2013 17:44:09 +0000
Subject: [PATCH] xen-netback: fix refcnt unbalance for 3.10
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id 279f438e36), vif disconnect and free are separated. However in the backported version reference counting code was not correctly modified, and the reset of vif->irq was lost. If frontend goes through vif life cycle more than once the reference counting is skewed.
This patch adds back the missing vif->irq reset line. It also moves several lines of the reference counting code to vif_free, so the moved code corresponds to the counterpart in vif_alloc, thus the reference counting is balanced.
--- drivers/net/xen-netback/interface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/xen-netback/interface.c +6 -4
@@ -365,17 +365,19 @@ void xenvif_disconnect(struct xenvif *vif)if (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); - -if (vif->irq) +if (vif->irq) {unbind_from_irqhandler (vif->irq, vif); + vif->irq =0 ; + }xen_netbk_unmap_frontend_rings (vif); }void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);
Signature · 1 line
1.7.10.4
Quoted 5 lines
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · Wei Liu
On Mon, Dec 02, 2013 at 09:19:58AM -0800, Greg KH wrote:
[...]Quoted 4 lines
As 3.11.y is now dead, there's not much I can do with that one, but I could use a backport for 3.10.y, as this patch does not apply there, thanks.
Here it is.
Thanks, that worked.
greg k-h
Quoted 8 lines · Wei Liu
On Mon, Dec 02, 2013 at 09:19:58AM -0800, Greg KH wrote:
[...]Quoted 4 lines
As 3.11.y is now dead, there's not much I can do with that one, but I could use a backport for 3.10.y, as this patch does not apply there, thanks.
Here it is.
Thanks, that worked.
greg k-h
[email protected]
AppliedPatch "xen-netback: fix refcnt unbalance for 3.10" has been added to the 3.10-stable tree
In reply to Wei LiuThis is a note to let you know that I've just added the patch titled
xen-netback: fix refcnt unbalance for 3.10
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xen-netback-fix-refcnt-unbalance-for-3.10.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From [email protected] Mon Dec 2 09:57:28 2013
From: Wei Liu <[email protected]>
Date: Mon, 2 Dec 2013 17:49:54 +0000
Subject: xen-netback: fix refcnt unbalance for 3.10
To: Greg KH <[email protected]>
Cc: Wei Liu <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, Ian Campbell <[email protected]>, Konrad Wilk <[email protected]>, David Vrabel <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline
From: Wei Liu <[email protected]>
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id 279f438e36), vif disconnect and free are separated. However in the backported version reference counting code was not correctly modified, and the reset of vif->irq was lost. If frontend goes through vif life cycle more than once the reference counting is skewed.
This patch adds back the missing vif->irq reset line. It also moves several lines of the reference counting code to vif_free, so the moved code corresponds to the counterpart in vif_alloc, thus the reference counting is balanced.
--- drivers/net/xen-netback/interface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/xen-netback/interface.c +6 -4
@@ -365,17 +365,19 @@ void xenvif_disconnect(struct xenvif *viif (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); - -if (vif->irq) +if (vif->irq) {unbind_from_irqhandler (vif->irq, vif); + vif->irq =0 ; + }xen_netbk_unmap_frontend_rings (vif); }void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/xen-netback-fix-refcnt-unbalance-for-3.10.patch
[email protected]
AppliedPatch "xen-netback: fix refcnt unbalance for 3.10" has been added to the 3.10-stable tree
In reply to Wei LiuThis is a note to let you know that I've just added the patch titled
xen-netback: fix refcnt unbalance for 3.10
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xen-netback-fix-refcnt-unbalance-for-3.10.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From [email protected] Mon Dec 2 09:57:28 2013
From: Wei Liu <[email protected]>
Date: Mon, 2 Dec 2013 17:49:54 +0000
Subject: xen-netback: fix refcnt unbalance for 3.10
To: Greg KH <[email protected]>
Cc: Wei Liu <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, <[email protected]>, Ian Campbell <[email protected]>, Konrad Wilk <[email protected]>, David Vrabel <[email protected]>
Message-ID: <[email protected]>
Content-Disposition: inline
From: Wei Liu <[email protected]>
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id 279f438e36), vif disconnect and free are separated. However in the backported version reference counting code was not correctly modified, and the reset of vif->irq was lost. If frontend goes through vif life cycle more than once the reference counting is skewed.
This patch adds back the missing vif->irq reset line. It also moves several lines of the reference counting code to vif_free, so the moved code corresponds to the counterpart in vif_alloc, thus the reference counting is balanced.
--- drivers/net/xen-netback/interface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/xen-netback/interface.c +6 -4
@@ -365,17 +365,19 @@ void xenvif_disconnect(struct xenvif *viif (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); - -if (vif->irq) +if (vif->irq) {unbind_from_irqhandler (vif->irq, vif); + vif->irq =0 ; + }xen_netbk_unmap_frontend_rings (vif); }void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/xen-netback-fix-refcnt-unbalance-for-3.10.patch
Wei Liu
Acked-by Ian CampbellOn Mon, Dec 02, 2013 at 09:19:58AM -0800, Greg KH wrote:
[...]
Quoted 4 lines
As 3.11.y is now dead, there's not much I can do with that one, but I could use a backport for 3.10.y, as this patch does not apply there, thanks.
Here it is.
---8<---
Quoted 1 line
From
f92adc90042cb725cf6351141f52e9fc71639a89Mon Sep 17 00:00:00 2001
From: Wei Liu <[email protected]>
Date: Mon, 2 Dec 2013 17:44:09 +0000
Subject: [PATCH] xen-netback: fix refcnt unbalance for 3.10
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id 279f438e36), vif disconnect and free are separated. However in the backported version reference counting code was not correctly modified, and the reset of vif->irq was lost. If frontend goes through vif life cycle more than once the reference counting is skewed.
This patch adds back the missing vif->irq reset line. It also moves several lines of the reference counting code to vif_free, so the moved code corresponds to the counterpart in vif_alloc, thus the reference counting is balanced.
--- drivers/net/xen-netback/interface.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/xen-netback/interface.c +6 -4
@@ -365,17 +365,19 @@ void xenvif_disconnect(struct xenvif *vif)if (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); - -if (vif->irq) +if (vif->irq) {unbind_from_irqhandler (vif->irq, vif); + vif->irq =0 ; + }xen_netbk_unmap_frontend_rings (vif); }void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);
Signature · 1 line
1.7.10.4
Quoted 5 lines
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 37 lines · Wei Liu
Quoted 16 lines · Greg KH
Quoted 15 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
Quoted 7 lines
Quoted 2 lines
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.What stable versions are those?
279f438e36showed up in 3.12-rc2, and was not marked for stable inclusion, so what kernel would end up needing this patch?Greg,
279f438e36was backported to at least stable branches3.11.y: <[email protected]> commit id
f495ddc463.10.y: <[email protected]> commit ida4626bf64So at least those two need this patch.
And I remeber 3.8.y.z extended stable branch maintained by Kamal also has the said commit.
Quoted 7 lines
Quoted 2 lines
confused,
Sorry, I should've stated cleared all versions.
BTW the above patch applies to 3.11.y. I can provide backports to 3.10.y as well, if necessary.
As 3.11.y is now dead, there's not much I can do with that one, but I could use a backport for 3.10.y, as this patch does not apply there, thanks.
greg k-h
Quoted 16 lines · Greg KH
Quoted 15 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
Quoted 7 lines
Quoted 2 lines
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.What stable versions are those?
279f438e36showed up in 3.12-rc2, and was not marked for stable inclusion, so what kernel would end up needing this patch?
Greg,
279f438e36 was backported to at least stable branches
3.11.y: <[email protected]> commit id f495ddc46 3.10.y: <[email protected]> commit id a4626bf64
So at least those two need this patch.
And I remeber 3.8.y.z extended stable branch maintained by Kamal also has the said commit.
Quoted 2 lines
confused,
Sorry, I should've stated cleared all versions.
BTW the above patch applies to 3.11.y. I can provide backports to 3.10.y as well, if necessary.
Wei.
Quoted 1 line
greg k-h
Quoted 12 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Quoted 5 lines
3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.
What stable versions are those? 279f438e36 showed up in 3.12-rc2, and was not marked for stable inclusion, so what kernel would end up needing this patch?
confused,
greg k-h
Quoted 12 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Quoted 5 lines
3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.
For some reason, I missed this patch. I'm queuing it now for the 3.11 kernel. Thank you!
Cheers,
--
Luis
Quoted 49 lines
Reported-and-tested-by Tomasz Wroblewski <[email protected]>Signed-off-by Wei Liu <[email protected]>Cc Ian Campbell <[email protected]>Cc Konrad Wilk <[email protected]>Cc David Vrabel <[email protected]>--- drivers/net/xen-netback/interface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/net/xen-netback/interface.c +4
-3@@ -418,9 +418,6 @@ void xenvif_disconnect(struct xenvif *vif)if (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -if (vif->tx_irq) {if (vif->tx_irq == vif->rx_irq)unbind_from_irqhandler (vif->tx_irq, vif);@@ -428,6 +425,7 @@ void xenvif_disconnect(struct xenvif *vif)unbind_from_irqhandler (vif->tx_irq, vif);unbind_from_irqhandler (vif->rx_irq, vif); } + vif->tx_irq =0 ; }xen_netbk_unmap_frontend_rings (vif);@@ -435,6 +433,9 @@ void xenvif_disconnect(struct xenvif *vif)void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);Signature · 6 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 12 lines · Wei Liu
With the introduction of "xen-netback: Don't destroy the netdev until the vif is shut down" (upstream commit id
279f438e36), vif disconnect and free are separated. However in the backported verion reference counting code was not correctly modified, and the reset ofvif->tx_irqwas lost. If frontend goes through vif life cycle more than once the reference counting is skewed.This patch adds back the missing
tx_irqreset line. It also moves several lines of the reference counting code tovif_free, so the moved code corresponds to the counterpart invif_alloc, thus the reference counting is balanced.
Quoted 5 lines
3.12 and onward versions are not affected by this bug, because reference counting code was removed due to the introduction of 1:1 model.
This pacth should be backported to all stable verions which are lower than 3.12 and have
279f438e36.
For some reason, I missed this patch. I'm queuing it now for the 3.11 kernel. Thank you!
Cheers,
--
Luis
Quoted 49 lines
Reported-and-tested-by Tomasz Wroblewski <[email protected]>Signed-off-by Wei Liu <[email protected]>Cc Ian Campbell <[email protected]>Cc Konrad Wilk <[email protected]>Cc David Vrabel <[email protected]>--- drivers/net/xen-netback/interface.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/net/xen-netback/interface.c +4
-3@@ -418,9 +418,6 @@ void xenvif_disconnect(struct xenvif *vif)if (netif_carrier_ok (vif->dev))xenvif_carrier_off (vif); -atomic_dec (&vif->refcnt); -wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); -if (vif->tx_irq) {if (vif->tx_irq == vif->rx_irq)unbind_from_irqhandler (vif->tx_irq, vif);@@ -428,6 +425,7 @@ void xenvif_disconnect(struct xenvif *vif)unbind_from_irqhandler (vif->tx_irq, vif);unbind_from_irqhandler (vif->rx_irq, vif); } + vif->tx_irq =0 ; }xen_netbk_unmap_frontend_rings (vif);@@ -435,6 +433,9 @@ void xenvif_disconnect(struct xenvif *vif)void xenvif_free (struct xenvif *vif) { +atomic_dec (&vif->refcnt); +wait_event (vif->waiting_to_free,atomic_read (&vif->refcnt) ==0 ); +unregister_netdev (vif->dev);free_netdev (vif->dev);Signature · 6 lines
1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html