* Re: [PATCH net-next] xen-netback: only deinitialized hash if it was initialized
[not found] <1463583342-25085-1-git-send-email-paul.durrant@citrix.com>
@ 2016-05-18 15:24 ` Wei Liu
2016-05-20 21:42 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Wei Liu @ 2016-05-18 15:24 UTC (permalink / raw)
To: Paul Durrant; +Cc: xen-devel, Wei Liu, netdev
On Wed, May 18, 2016 at 03:55:42PM +0100, Paul Durrant wrote:
> A domain with a frontend that does not implement a control ring has been
> seen to cause a crash during domain save. This was apparently because
> the call to xenvif_deinit_hash() in xenvif_disconnect_ctrl() is made
> regardless of whether a control ring was connected, and hence
> xenvif_hash_init() was called.
>
> This patch brings the call to xenvif_deinit_hash() in
> xenvif_disconnect_ctrl() inside the if clause that checks whether the
> control ring event channel was connected. This is sufficient to ensure
> it is only called if xenvif_init_hash() was called previously.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
> ---
> drivers/net/xen-netback/interface.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
> index 1c7f49b..83deeeb 100644
> --- a/drivers/net/xen-netback/interface.c
> +++ b/drivers/net/xen-netback/interface.c
> @@ -780,9 +780,8 @@ void xenvif_disconnect_ctrl(struct xenvif *vif)
> vif->ctrl_task = NULL;
> }
>
> - xenvif_deinit_hash(vif);
> -
> if (vif->ctrl_irq) {
> + xenvif_deinit_hash(vif);
> unbind_from_irqhandler(vif->ctrl_irq, vif);
> vif->ctrl_irq = 0;
> }
> --
> 2.1.4
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] xen-netback: only deinitialized hash if it was initialized
[not found] <1463583342-25085-1-git-send-email-paul.durrant@citrix.com>
2016-05-18 15:24 ` [PATCH net-next] xen-netback: only deinitialized hash if it was initialized Wei Liu
@ 2016-05-20 21:42 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-05-20 21:42 UTC (permalink / raw)
To: paul.durrant; +Cc: xen-devel, wei.liu2, netdev
From: Paul Durrant <paul.durrant@citrix.com>
Date: Wed, 18 May 2016 15:55:42 +0100
> A domain with a frontend that does not implement a control ring has been
> seen to cause a crash during domain save. This was apparently because
> the call to xenvif_deinit_hash() in xenvif_disconnect_ctrl() is made
> regardless of whether a control ring was connected, and hence
> xenvif_hash_init() was called.
>
> This patch brings the call to xenvif_deinit_hash() in
> xenvif_disconnect_ctrl() inside the if clause that checks whether the
> control ring event channel was connected. This is sufficient to ensure
> it is only called if xenvif_init_hash() was called previously.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Applied, thanks.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH net-next] xen-netback: only deinitialized hash if it was initialized
@ 2016-05-18 14:55 Paul Durrant
0 siblings, 0 replies; 3+ messages in thread
From: Paul Durrant @ 2016-05-18 14:55 UTC (permalink / raw)
To: xen-devel, netdev; +Cc: Paul Durrant, Wei Liu
A domain with a frontend that does not implement a control ring has been
seen to cause a crash during domain save. This was apparently because
the call to xenvif_deinit_hash() in xenvif_disconnect_ctrl() is made
regardless of whether a control ring was connected, and hence
xenvif_hash_init() was called.
This patch brings the call to xenvif_deinit_hash() in
xenvif_disconnect_ctrl() inside the if clause that checks whether the
control ring event channel was connected. This is sufficient to ensure
it is only called if xenvif_init_hash() was called previously.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Reported-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Tested-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
drivers/net/xen-netback/interface.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c
index 1c7f49b..83deeeb 100644
--- a/drivers/net/xen-netback/interface.c
+++ b/drivers/net/xen-netback/interface.c
@@ -780,9 +780,8 @@ void xenvif_disconnect_ctrl(struct xenvif *vif)
vif->ctrl_task = NULL;
}
- xenvif_deinit_hash(vif);
-
if (vif->ctrl_irq) {
+ xenvif_deinit_hash(vif);
unbind_from_irqhandler(vif->ctrl_irq, vif);
vif->ctrl_irq = 0;
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-20 21:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1463583342-25085-1-git-send-email-paul.durrant@citrix.com>
2016-05-18 15:24 ` [PATCH net-next] xen-netback: only deinitialized hash if it was initialized Wei Liu
2016-05-20 21:42 ` David Miller
2016-05-18 14:55 Paul Durrant
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).