pktcdvd: use BIO list management functions

Now that the bio list management stuff is generic, convert pktcdvd to use bio lists instead of its own private bio list implementation. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Peter Osterlund <petero2@telia.com> Cc: Christoph Hellwig <hch@infradead.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

pktcdvd: use BIO list management functions
Now that the bio list management stuff is generic, convert pktcdvd to use bio lists instead of its own private bio list implementation. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Acked-by: Peter Osterlund <petero2@telia.com> Cc: Christoph Hellwig <hch@infradead.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Akinobu Mita · Jens Axboe
1 parent bddd87c7e6
Showing 2 changed files with 25 additions and 74 deletions Side-by-side Diff
drivers/block/pktcdvd.c
include/linux/pktcdvd.h
@@ -569,6 +569,7 @@
 	}
  
 	spin_lock_init(&pkt->lock);
+	bio_list_init(&pkt->orig_bios);
  
 	for (i = 0; i < frames; i++) {
 		struct bio *bio = pkt_bio_alloc(1);
@@ -721,43 +722,6 @@
 }
  
 /*
- * Add a bio to a single linked list defined by its head and tail pointers.
- */
-static void pkt_add_list_last(struct bio *bio, struct bio **list_head, struct bio **list_tail)
-{
-	bio->bi_next = NULL;
-	if (*list_tail) {
-		BUG_ON((*list_head) == NULL);
-		(*list_tail)->bi_next = bio;
-		(*list_tail) = bio;
-	} else {
-		BUG_ON((*list_head) != NULL);
-		(*list_head) = bio;
-		(*list_tail) = bio;
-	}
-}
-
-/*
- * Remove and return the first bio from a single linked list defined by its
- * head and tail pointers.
- */
-static inline struct bio *pkt_get_list_first(struct bio **list_head, struct bio **list_tail)
-{
-	struct bio *bio;
-
-	if (*list_head == NULL)
-		return NULL;
-
-	bio = *list_head;
-	*list_head = bio->bi_next;
-	if (*list_head == NULL)
-		*list_tail = NULL;
-
-	bio->bi_next = NULL;
-	return bio;
-}
-
-/*
  * Send a packet_command to the underlying block device and
  * wait for completion.
  */
@@ -876,13 +840,10 @@
 static void pkt_queue_bio(struct pktcdvd_device *pd, struct bio *bio)
 {
 	spin_lock(&pd->iosched.lock);
-	if (bio_data_dir(bio) == READ) {
-		pkt_add_list_last(bio, &pd->iosched.read_queue,
-				  &pd->iosched.read_queue_tail);
-	} else {
-		pkt_add_list_last(bio, &pd->iosched.write_queue,
-				  &pd->iosched.write_queue_tail);
-	}
+	if (bio_data_dir(bio) == READ)
+		bio_list_add(&pd->iosched.read_queue, bio);
+	else
+		bio_list_add(&pd->iosched.write_queue, bio);
 	spin_unlock(&pd->iosched.lock);
  
 	atomic_set(&pd->iosched.attention, 1);
@@ -917,8 +878,8 @@
 		int reads_queued, writes_queued;
  
 		spin_lock(&pd->iosched.lock);
-		reads_queued = (pd->iosched.read_queue != NULL);
-		writes_queued = (pd->iosched.write_queue != NULL);
+		reads_queued = !bio_list_empty(&pd->iosched.read_queue);
+		writes_queued = !bio_list_empty(&pd->iosched.write_queue);
 		spin_unlock(&pd->iosched.lock);
  
 		if (!reads_queued && !writes_queued)
@@ -927,7 +888,7 @@
 		if (pd->iosched.writing) {
 			int need_write_seek = 1;
 			spin_lock(&pd->iosched.lock);
-			bio = pd->iosched.write_queue;
+			bio = bio_list_peek(&pd->iosched.write_queue);
 			spin_unlock(&pd->iosched.lock);
 			if (bio && (bio->bi_sector == pd->iosched.last_write))
 				need_write_seek = 0;
@@ -950,13 +911,10 @@
 		}
  
 		spin_lock(&pd->iosched.lock);
-		if (pd->iosched.writing) {
-			bio = pkt_get_list_first(&pd->iosched.write_queue,
-						 &pd->iosched.write_queue_tail);
-		} else {
-			bio = pkt_get_list_first(&pd->iosched.read_queue,
-						 &pd->iosched.read_queue_tail);
-		}
+		if (pd->iosched.writing)
+			bio = bio_list_pop(&pd->iosched.write_queue);
+		else
+			bio = bio_list_pop(&pd->iosched.read_queue);
 		spin_unlock(&pd->iosched.lock);
  
 		if (!bio)
@@ -1114,7 +1072,7 @@
 	int f;
 	char written[PACKET_MAX_SIZE];
  
-	BUG_ON(!pkt->orig_bios);
+	BUG_ON(bio_list_empty(&pkt->orig_bios));
  
 	atomic_set(&pkt->io_wait, 0);
 	atomic_set(&pkt->io_errors, 0);
@@ -1124,7 +1082,7 @@
 	 */
 	memset(written, 0, sizeof(written));
 	spin_lock(&pkt->lock);
-	for (bio = pkt->orig_bios; bio; bio = bio->bi_next) {
+	bio_list_for_each(bio, &pkt->orig_bios) {
 		int first_frame = (bio->bi_sector - pkt->sector) / (CD_FRAMESIZE >> 9);
 		int num_frames = bio->bi_size / CD_FRAMESIZE;
 		pd->stats.secs_w += num_frames * (CD_FRAMESIZE >> 9);
@@ -1363,7 +1321,7 @@
 			break;
 		pkt_rbtree_erase(pd, node);
 		spin_lock(&pkt->lock);
-		pkt_add_list_last(bio, &pkt->orig_bios, &pkt->orig_bios_tail);
+		bio_list_add(&pkt->orig_bios, bio);
 		pkt->write_size += bio->bi_size / CD_FRAMESIZE;
 		spin_unlock(&pkt->lock);
 	}
@@ -1409,7 +1367,7 @@
 	 */
 	frames_write = 0;
 	spin_lock(&pkt->lock);
-	for (bio = pkt->orig_bios; bio; bio = bio->bi_next) {
+	bio_list_for_each(bio, &pkt->orig_bios) {
 		int segment = bio->bi_idx;
 		int src_offs = 0;
 		int first_frame = (bio->bi_sector - pkt->sector) / (CD_FRAMESIZE >> 9);
  
  
@@ -1472,20 +1430,14 @@
  
 static void pkt_finish_packet(struct packet_data *pkt, int uptodate)
 {
-	struct bio *bio, *next;
+	struct bio *bio;
  
 	if (!uptodate)
 		pkt->cache_valid = 0;
  
 	/* Finish all bios corresponding to this packet */
-	bio = pkt->orig_bios;
-	while (bio) {
-		next = bio->bi_next;
-		bio->bi_next = NULL;
+	while ((bio = bio_list_pop(&pkt->orig_bios)))
 		bio_endio(bio, uptodate ? 0 : -EIO);
-		bio = next;
-	}
-	pkt->orig_bios = pkt->orig_bios_tail = NULL;
 }
  
 static void pkt_run_state_machine(struct pktcdvd_device *pd, struct packet_data *pkt)
@@ -2567,8 +2519,7 @@
 			spin_lock(&pkt->lock);
 			if ((pkt->state == PACKET_WAITING_STATE) ||
 			    (pkt->state == PACKET_READ_WAIT_STATE)) {
-				pkt_add_list_last(bio, &pkt->orig_bios,
-						  &pkt->orig_bios_tail);
+				bio_list_add(&pkt->orig_bios, bio);
 				pkt->write_size += bio->bi_size / CD_FRAMESIZE;
 				if ((pkt->write_size >= pkt->frames) &&
 				    (pkt->state == PACKET_WAITING_STATE)) {
@@ -2898,6 +2849,8 @@
  
 	spin_lock_init(&pd->lock);
 	spin_lock_init(&pd->iosched.lock);
+	bio_list_init(&pd->iosched.read_queue);
+	bio_list_init(&pd->iosched.write_queue);
 	sprintf(pd->name, DRIVER_NAME"%d", idx);
 	init_waitqueue_head(&pd->wqueue);
 	pd->bio_queue = RB_ROOT;
@@ -163,10 +163,8 @@
 	atomic_t		attention;	/* Set to non-zero when queue processing is needed */
 	int			writing;	/* Non-zero when writing, zero when reading */
 	spinlock_t		lock;		/* Protecting read/write queue manipulations */
-	struct bio		*read_queue;
-	struct bio		*read_queue_tail;
-	struct bio		*write_queue;
-	struct bio		*write_queue_tail;
+	struct bio_list		read_queue;
+	struct bio_list		write_queue;
 	sector_t		last_write;	/* The sector where the last write ended */
 	int			successive_reads;
 };
@@ -206,8 +204,8 @@
 	spinlock_t		lock;		/* Lock protecting state transitions and */
 						/* orig_bios list */
  
-	struct bio		*orig_bios;	/* Original bios passed to pkt_make_request */
-	struct bio		*orig_bios_tail;/* that will be handled by this packet */
+	struct bio_list		orig_bios;	/* Original bios passed to pkt_make_request */
+						/* that will be handled by this packet */
 	int			write_size;	/* Total size of all bios in the orig_bios */
 						/* list, measured in number of frames */
...	...	@@ -569,6 +569,7 @@
569	569	}
570	570
571	571	spin_lock_init(&pkt->lock);
	572	+ bio_list_init(&pkt->orig_bios);
572	573
573	574	for (i = 0; i < frames; i++) {
574	575	struct bio *bio = pkt_bio_alloc(1);
...	...	@@ -721,43 +722,6 @@
721	722	}
722	723
723	724	/*
724		- * Add a bio to a single linked list defined by its head and tail pointers.
725		- */
726		-static void pkt_add_list_last(struct bio bio, struct bio list_head, struct bio *list_tail)
727		-{
728		- bio->bi_next = NULL;
729		- if (*list_tail) {
730		- BUG_ON((*list_head) == NULL);
731		- (*list_tail)->bi_next = bio;
732		- (*list_tail) = bio;
733		- } else {
734		- BUG_ON((*list_head) != NULL);
735		- (*list_head) = bio;
736		- (*list_tail) = bio;
737		- }
738		-}
739		-
740		-/*
741		- * Remove and return the first bio from a single linked list defined by its
742		- * head and tail pointers.
743		- */
744		-static inline struct bio pkt_get_list_first(struct bio list_head, struct bio *list_tail)
745		-{
746		- struct bio *bio;
747		-
748		- if (*list_head == NULL)
749		- return NULL;
750		-
751		- bio = *list_head;
752		- *list_head = bio->bi_next;
753		- if (*list_head == NULL)
754		- *list_tail = NULL;
755		-
756		- bio->bi_next = NULL;
757		- return bio;
758		-}
759		-
760		-/*
761	725	* Send a packet_command to the underlying block device and
762	726	* wait for completion.
763	727	*/
...	...	@@ -876,13 +840,10 @@
876	840	static void pkt_queue_bio(struct pktcdvd_device pd, struct bio bio)
877	841	{
878	842	spin_lock(&pd->iosched.lock);
879		- if (bio_data_dir(bio) == READ) {
880		- pkt_add_list_last(bio, &pd->iosched.read_queue,
881		- &pd->iosched.read_queue_tail);
882		- } else {
883		- pkt_add_list_last(bio, &pd->iosched.write_queue,
884		- &pd->iosched.write_queue_tail);
885		- }
	843	+ if (bio_data_dir(bio) == READ)
	844	+ bio_list_add(&pd->iosched.read_queue, bio);
	845	+ else
	846	+ bio_list_add(&pd->iosched.write_queue, bio);
886	847	spin_unlock(&pd->iosched.lock);
887	848
888	849	atomic_set(&pd->iosched.attention, 1);
...	...	@@ -917,8 +878,8 @@
917	878	int reads_queued, writes_queued;
918	879
919	880	spin_lock(&pd->iosched.lock);
920		- reads_queued = (pd->iosched.read_queue != NULL);
921		- writes_queued = (pd->iosched.write_queue != NULL);
	881	+ reads_queued = !bio_list_empty(&pd->iosched.read_queue);
	882	+ writes_queued = !bio_list_empty(&pd->iosched.write_queue);
922	883	spin_unlock(&pd->iosched.lock);
923	884
924	885	if (!reads_queued && !writes_queued)
...	...	@@ -927,7 +888,7 @@
927	888	if (pd->iosched.writing) {
928	889	int need_write_seek = 1;
929	890	spin_lock(&pd->iosched.lock);
930		- bio = pd->iosched.write_queue;
	891	+ bio = bio_list_peek(&pd->iosched.write_queue);
931	892	spin_unlock(&pd->iosched.lock);
932	893	if (bio && (bio->bi_sector == pd->iosched.last_write))
933	894	need_write_seek = 0;
...	...	@@ -950,13 +911,10 @@
950	911	}
951	912
952	913	spin_lock(&pd->iosched.lock);
953		- if (pd->iosched.writing) {
954		- bio = pkt_get_list_first(&pd->iosched.write_queue,
955		- &pd->iosched.write_queue_tail);
956		- } else {
957		- bio = pkt_get_list_first(&pd->iosched.read_queue,
958		- &pd->iosched.read_queue_tail);
959		- }
	914	+ if (pd->iosched.writing)
	915	+ bio = bio_list_pop(&pd->iosched.write_queue);
	916	+ else
	917	+ bio = bio_list_pop(&pd->iosched.read_queue);
960	918	spin_unlock(&pd->iosched.lock);
961	919
962	920	if (!bio)
...	...	@@ -1114,7 +1072,7 @@
1114	1072	int f;
1115	1073	char written[PACKET_MAX_SIZE];
1116	1074
1117		- BUG_ON(!pkt->orig_bios);
	1075	+ BUG_ON(bio_list_empty(&pkt->orig_bios));
1118	1076
1119	1077	atomic_set(&pkt->io_wait, 0);
1120	1078	atomic_set(&pkt->io_errors, 0);
...	...	@@ -1124,7 +1082,7 @@
1124	1082	*/
1125	1083	memset(written, 0, sizeof(written));
1126	1084	spin_lock(&pkt->lock);
1127		- for (bio = pkt->orig_bios; bio; bio = bio->bi_next) {
	1085	+ bio_list_for_each(bio, &pkt->orig_bios) {
1128	1086	int first_frame = (bio->bi_sector - pkt->sector) / (CD_FRAMESIZE >> 9);
1129	1087	int num_frames = bio->bi_size / CD_FRAMESIZE;
1130	1088	pd->stats.secs_w += num_frames * (CD_FRAMESIZE >> 9);
...	...	@@ -1363,7 +1321,7 @@
1363	1321	break;
1364	1322	pkt_rbtree_erase(pd, node);
1365	1323	spin_lock(&pkt->lock);
1366		- pkt_add_list_last(bio, &pkt->orig_bios, &pkt->orig_bios_tail);
	1324	+ bio_list_add(&pkt->orig_bios, bio);
1367	1325	pkt->write_size += bio->bi_size / CD_FRAMESIZE;
1368	1326	spin_unlock(&pkt->lock);
1369	1327	}
...	...	@@ -1409,7 +1367,7 @@
1409	1367	*/
1410	1368	frames_write = 0;
1411	1369	spin_lock(&pkt->lock);
1412		- for (bio = pkt->orig_bios; bio; bio = bio->bi_next) {
	1370	+ bio_list_for_each(bio, &pkt->orig_bios) {
1413	1371	int segment = bio->bi_idx;
1414	1372	int src_offs = 0;
1415	1373	int first_frame = (bio->bi_sector - pkt->sector) / (CD_FRAMESIZE >> 9);
1416	1374
1417	1375
...	...	@@ -1472,20 +1430,14 @@
1472	1430
1473	1431	static void pkt_finish_packet(struct packet_data *pkt, int uptodate)
1474	1432	{
1475		- struct bio bio, next;
	1433	+ struct bio *bio;
1476	1434
1477	1435	if (!uptodate)
1478	1436	pkt->cache_valid = 0;
1479	1437
1480	1438	/* Finish all bios corresponding to this packet */
1481		- bio = pkt->orig_bios;
1482		- while (bio) {
1483		- next = bio->bi_next;
1484		- bio->bi_next = NULL;
	1439	+ while ((bio = bio_list_pop(&pkt->orig_bios)))
1485	1440	bio_endio(bio, uptodate ? 0 : -EIO);
1486		- bio = next;
1487		- }
1488		- pkt->orig_bios = pkt->orig_bios_tail = NULL;
1489	1441	}
1490	1442
1491	1443	static void pkt_run_state_machine(struct pktcdvd_device pd, struct packet_data pkt)
...	...	@@ -2567,8 +2519,7 @@
2567	2519	spin_lock(&pkt->lock);
2568	2520	if ((pkt->state == PACKET_WAITING_STATE) \|\|
2569	2521	(pkt->state == PACKET_READ_WAIT_STATE)) {
2570		- pkt_add_list_last(bio, &pkt->orig_bios,
2571		- &pkt->orig_bios_tail);
	2522	+ bio_list_add(&pkt->orig_bios, bio);
2572	2523	pkt->write_size += bio->bi_size / CD_FRAMESIZE;
2573	2524	if ((pkt->write_size >= pkt->frames) &&
2574	2525	(pkt->state == PACKET_WAITING_STATE)) {
...	...	@@ -2898,6 +2849,8 @@
2898	2849
2899	2850	spin_lock_init(&pd->lock);
2900	2851	spin_lock_init(&pd->iosched.lock);
	2852	+ bio_list_init(&pd->iosched.read_queue);
	2853	+ bio_list_init(&pd->iosched.write_queue);
2901	2854	sprintf(pd->name, DRIVER_NAME"%d", idx);
2902	2855	init_waitqueue_head(&pd->wqueue);
2903	2856	pd->bio_queue = RB_ROOT;
...	...	@@ -163,10 +163,8 @@
163	163	atomic_t attention; /* Set to non-zero when queue processing is needed */
164	164	int writing; /* Non-zero when writing, zero when reading */
165	165	spinlock_t lock; /* Protecting read/write queue manipulations */
166		- struct bio *read_queue;
167		- struct bio *read_queue_tail;
168		- struct bio *write_queue;
169		- struct bio *write_queue_tail;
	166	+ struct bio_list read_queue;
	167	+ struct bio_list write_queue;
170	168	sector_t last_write; /* The sector where the last write ended */
171	169	int successive_reads;
172	170	};
...	...	@@ -206,8 +204,8 @@
206	204	spinlock_t lock; /* Lock protecting state transitions and */
207	205	/* orig_bios list */
208	206
209		- struct bio orig_bios; / Original bios passed to pkt_make_request */
210		- struct bio orig_bios_tail;/ that will be handled by this packet */
	207	+ struct bio_list orig_bios; /* Original bios passed to pkt_make_request */
	208	+ /* that will be handled by this packet */
211	209	int write_size; /* Total size of all bios in the orig_bios */
212	210	/* list, measured in number of frames */
213	211