Skip to contentSkip to conversation

linux:blktap: Fix Reconnect demand by Frontend

PATCH New Tomonari Horikoshi 1 participant 1 message Sep 9, 2008 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux:blktap: Fix Reconnect demand by Frontend

Hi all.

This patch is a correction of the reconnected
demand by Frontend when blktap mode.

The resource is not released at XenbusStateClosing. it corrected it like blkback.

Best regards,
Horikoshi

# HG changeset patch
# User [email protected]
# Date 1220942064 -32400
# Node ID c431f7e460555723353934ab741fafab7949cddf # Parent 8566781df55ead884c55bd4ce8eac7f7391a05f9 Fix Reconnect demand by Frontend

drivers/xen/blktap/common.h +1 -0
diff -r 8566781df55e -r c431f7e46055 drivers/xen/blktap/common.h
@@ -89,6 +89,7 @@ typedef struct blkif_st {
 
 blkif_t *tap_alloc_blkif(domid_t domid);
 void tap_blkif_free(blkif_t *blkif);
+void tap_blkif_kmem_cache_free(blkif_t *blkif);
 int tap_blkif_map(blkif_t *blkif, unsigned long shared_page, 
 		  unsigned int evtchn);
 void tap_blkif_unmap(blkif_t *blkif);
drivers/xen/blktap/interface.c +9 -0
diff -r 8566781df55e -r c431f7e46055 drivers/xen/blktap/interface.c
@@ -162,8 +162,17 @@ void tap_blkif_free(blkif_t *blkif)
 {
 	atomic_dec(&blkif->refcnt);
 	wait_event(blkif->waiting_to_free, atomic_read(&blkif->refcnt) == 0);
+	atomic_inc(&blkif->refcnt);
 
 	tap_blkif_unmap(blkif);
+}
+
+void tap_blkif_kmem_cache_free(blkif_t *blkif)
+{
+	if (!atomic_dec_and_test(&blkif->refcnt)) {
+		DPRINTK("blkif still in use!\n");
+		return;
+	}
 	kmem_cache_free(blkif_cachep, blkif);
 }
 
drivers/xen/blktap/xenbus.c +2 -0
diff -r 8566781df55e -r c431f7e46055 drivers/xen/blktap/xenbus.c
@@ -182,6 +182,7 @@ static int blktap_remove(struct xenbus_d
 			kthread_stop(be->blkif->xenblkd);
 		signal_tapdisk(be->blkif->dev_num);
 		tap_blkif_free(be->blkif);
+		tap_blkif_kmem_cache_free(be->blkif);
 		be->blkif = NULL;
 	}
 	kfree(be);
@@ -364,6 +365,7 @@ static void tap_frontend_changed(struct 
 			kthread_stop(be->blkif->xenblkd);
 			be->blkif->xenblkd = NULL;
 		}
+		tap_blkif_free(be->blkif);
 		xenbus_switch_state(dev, XenbusStateClosing);
 		break;
 

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel