diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2011-07-31 16:05:09 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2011-07-31 16:05:09 -0400 |
| commit | aa387cc895672b00f807ad7c734a2defaf677712 (patch) | |
| tree | 31c2c3f3e0d58ff2524cdf8f94abecc394f5eb49 /include | |
| parent | 24c3047095fa3954f114bfff2e37b8fcbb216396 (diff) | |
block: add bsg helper library
This moves the FC classes bsg code to the block layer and
makes it a lib so that other classes like iscsi and SAS can use it.
It is helpful because working with the request queue, bios,
creating scatterlists, etc are a pain that the LLD does not
have to worry about with normal IOs and should not have to
worry about for bsg requests.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 4 | ||||
| -rw-r--r-- | include/linux/bsg-lib.h | 73 |
2 files changed, 77 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 0e67c45b3bc9..847928546076 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
| @@ -30,6 +30,7 @@ struct request_pm_state; | |||
| 30 | struct blk_trace; | 30 | struct blk_trace; |
| 31 | struct request; | 31 | struct request; |
| 32 | struct sg_io_hdr; | 32 | struct sg_io_hdr; |
| 33 | struct bsg_job; | ||
| 33 | 34 | ||
| 34 | #define BLKDEV_MIN_RQ 4 | 35 | #define BLKDEV_MIN_RQ 4 |
| 35 | #define BLKDEV_MAX_RQ 128 /* Default maximum */ | 36 | #define BLKDEV_MAX_RQ 128 /* Default maximum */ |
| @@ -209,6 +210,7 @@ typedef int (merge_bvec_fn) (struct request_queue *, struct bvec_merge_data *, | |||
| 209 | typedef void (softirq_done_fn)(struct request *); | 210 | typedef void (softirq_done_fn)(struct request *); |
| 210 | typedef int (dma_drain_needed_fn)(struct request *); | 211 | typedef int (dma_drain_needed_fn)(struct request *); |
| 211 | typedef int (lld_busy_fn) (struct request_queue *q); | 212 | typedef int (lld_busy_fn) (struct request_queue *q); |
| 213 | typedef int (bsg_job_fn) (struct bsg_job *); | ||
| 212 | 214 | ||
| 213 | enum blk_eh_timer_return { | 215 | enum blk_eh_timer_return { |
| 214 | BLK_EH_NOT_HANDLED, | 216 | BLK_EH_NOT_HANDLED, |
| @@ -375,6 +377,8 @@ struct request_queue { | |||
| 375 | struct mutex sysfs_lock; | 377 | struct mutex sysfs_lock; |
| 376 | 378 | ||
| 377 | #if defined(CONFIG_BLK_DEV_BSG) | 379 | #if defined(CONFIG_BLK_DEV_BSG) |
| 380 | bsg_job_fn *bsg_job_fn; | ||
| 381 | int bsg_job_size; | ||
| 378 | struct bsg_class_device bsg_dev; | 382 | struct bsg_class_device bsg_dev; |
| 379 | #endif | 383 | #endif |
| 380 | 384 | ||
diff --git a/include/linux/bsg-lib.h b/include/linux/bsg-lib.h new file mode 100644 index 000000000000..f55ab8cdc106 --- /dev/null +++ b/include/linux/bsg-lib.h | |||
| @@ -0,0 +1,73 @@ | |||
| 1 | /* | ||
| 2 | * BSG helper library | ||
| 3 | * | ||
| 4 | * Copyright (C) 2008 James Smart, Emulex Corporation | ||
| 5 | * Copyright (C) 2011 Red Hat, Inc. All rights reserved. | ||
| 6 | * Copyright (C) 2011 Mike Christie | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License as published by | ||
| 10 | * the Free Software Foundation; either version 2 of the License, or | ||
| 11 | * (at your option) any later version. | ||
| 12 | * | ||
| 13 | * This program is distributed in the hope that it will be useful, | ||
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 16 | * GNU General Public License for more details. | ||
| 17 | * | ||
| 18 | * You should have received a copy of the GNU General Public License | ||
| 19 | * along with this program; if not, write to the Free Software | ||
| 20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 21 | * | ||
| 22 | */ | ||
| 23 | #ifndef _BLK_BSG_ | ||
| 24 | #define _BLK_BSG_ | ||
| 25 | |||
| 26 | #include <linux/blkdev.h> | ||
| 27 | |||
| 28 | struct request; | ||
| 29 | struct device; | ||
| 30 | struct scatterlist; | ||
| 31 | struct request_queue; | ||
| 32 | |||
| 33 | struct bsg_buffer { | ||
| 34 | unsigned int payload_len; | ||
| 35 | int sg_cnt; | ||
| 36 | struct scatterlist *sg_list; | ||
| 37 | }; | ||
| 38 | |||
| 39 | struct bsg_job { | ||
| 40 | struct device *dev; | ||
| 41 | struct request *req; | ||
| 42 | |||
| 43 | /* Transport/driver specific request/reply structs */ | ||
| 44 | void *request; | ||
| 45 | void *reply; | ||
| 46 | |||
| 47 | unsigned int request_len; | ||
| 48 | unsigned int reply_len; | ||
| 49 | /* | ||
| 50 | * On entry : reply_len indicates the buffer size allocated for | ||
| 51 | * the reply. | ||
| 52 | * | ||
| 53 | * Upon completion : the message handler must set reply_len | ||
| 54 | * to indicates the size of the reply to be returned to the | ||
| 55 | * caller. | ||
| 56 | */ | ||
| 57 | |||
| 58 | /* DMA payloads for the request/response */ | ||
| 59 | struct bsg_buffer request_payload; | ||
| 60 | struct bsg_buffer reply_payload; | ||
| 61 | |||
| 62 | void *dd_data; /* Used for driver-specific storage */ | ||
| 63 | }; | ||
| 64 | |||
| 65 | void bsg_job_done(struct bsg_job *job, int result, | ||
| 66 | unsigned int reply_payload_rcv_len); | ||
| 67 | int bsg_setup_queue(struct device *dev, struct request_queue *q, char *name, | ||
| 68 | bsg_job_fn *job_fn, int dd_job_size); | ||
| 69 | void bsg_request_fn(struct request_queue *q); | ||
| 70 | void bsg_remove_queue(struct request_queue *q); | ||
| 71 | void bsg_goose_queue(struct request_queue *q); | ||
| 72 | |||
| 73 | #endif | ||
