hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

skd: Remove skd_device.in_flight 

Since skd_device.in_flight is only used to display the number of
in-flight requests in debug messages, remove that member and
introduce skd_in_flight(). That last function relies on the block
layer to determine the number of in flight requests.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Bart Van Assche 2017-08-17 13:13:34 -07:00 committed by Jens Axboe
parent a74d5b76fa
commit d4d0f5fc3a
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/block/skd_main.c
View File

@ -238,7 +238,6 @@ struct skd_device {
enum skd_drvr_state state; enum skd_drvr_state state;
u32 drive_state; u32 drive_state;
atomic_t in_flight;
u32 cur_max_queue_depth; u32 cur_max_queue_depth;
u32 queue_low_water_mark; u32 queue_low_water_mark;
u32 dev_max_queue_depth; u32 dev_max_queue_depth;
@ -391,6 +390,22 @@ static void skd_log_skreq(struct skd_device *skdev,
* READ/WRITE REQUESTS * READ/WRITE REQUESTS
***************************************************************************** *****************************************************************************
*/ */
static void skd_inc_in_flight(struct request *rq, void *data, bool reserved)
{
int *count = data;
count++;
}
static int skd_in_flight(struct skd_device *skdev)
{
int count = 0;
blk_mq_tagset_busy_iter(&skdev->tag_set, skd_inc_in_flight, &count);
return count;
}
static void static void
skd_prep_rw_cdb(struct skd_scsi_request *scsi_req, skd_prep_rw_cdb(struct skd_scsi_request *scsi_req,
int data_dir, unsigned lba, int data_dir, unsigned lba,
@ -567,9 +582,8 @@ static void skd_process_request(struct request *req, bool last)
skmsg->length += sizeof(struct skd_scsi_request); skmsg->length += sizeof(struct skd_scsi_request);
fmh->num_protocol_cmds_coalesced++; fmh->num_protocol_cmds_coalesced++;
atomic_inc(&skdev->in_flight);
dev_dbg(&skdev->pdev->dev, "req=0x%x busy=%d\n", skreq->id, dev_dbg(&skdev->pdev->dev, "req=0x%x busy=%d\n", skreq->id,
atomic_read(&skdev->in_flight)); skd_in_flight(skdev));
/* /*
* If the FIT msg buffer is full send it. * If the FIT msg buffer is full send it.
@ -1218,7 +1232,7 @@ static void skd_send_fitmsg(struct skd_device *skdev,
u64 qcmd; u64 qcmd;
dev_dbg(&skdev->pdev->dev, "dma address 0x%llx, busy=%d\n", dev_dbg(&skdev->pdev->dev, "dma address 0x%llx, busy=%d\n",
skmsg->mb_dma_address, atomic_read(&skdev->in_flight)); skmsg->mb_dma_address, skd_in_flight(skdev));
dev_dbg(&skdev->pdev->dev, "msg_buf %p\n", skmsg->msg_buf); dev_dbg(&skdev->pdev->dev, "msg_buf %p\n", skmsg->msg_buf);
qcmd = skmsg->mb_dma_address; qcmd = skmsg->mb_dma_address;
@ -1451,13 +1465,6 @@ static void skd_resolve_req_exception(struct skd_device *skdev,
static void skd_release_skreq(struct skd_device *skdev, static void skd_release_skreq(struct skd_device *skdev,
struct skd_request_context *skreq) struct skd_request_context *skreq)
{ {
/*
* Decrease the number of active requests.
* Also decrements the count in the timeout slot.
*/
SKD_ASSERT(atomic_read(&skdev->in_flight) > 0);
atomic_dec(&skdev->in_flight);
/* /*
* Reclaim the skd_request_context * Reclaim the skd_request_context
*/ */
@ -1498,7 +1505,7 @@ static int skd_isr_completion_posted(struct skd_device *skdev,
dev_dbg(&skdev->pdev->dev, dev_dbg(&skdev->pdev->dev,
"cycle=%d ix=%d got cycle=%d cmdctxt=0x%x stat=%d busy=%d rbytes=0x%x proto=%d\n", "cycle=%d ix=%d got cycle=%d cmdctxt=0x%x stat=%d busy=%d rbytes=0x%x proto=%d\n",
skdev->skcomp_cycle, skdev->skcomp_ix, cmp_cycle, skdev->skcomp_cycle, skdev->skcomp_ix, cmp_cycle,
cmp_cntxt, cmp_status, atomic_read(&skdev->in_flight), cmp_cntxt, cmp_status, skd_in_flight(skdev),
cmp_bytes, skdev->proto_ver); cmp_bytes, skdev->proto_ver);
if (cmp_cycle != skdev->skcomp_cycle) { if (cmp_cycle != skdev->skcomp_cycle) {
@ -1590,7 +1597,7 @@ static int skd_isr_completion_posted(struct skd_device *skdev,
} }
if (skdev->state == SKD_DRVR_STATE_PAUSING && if (skdev->state == SKD_DRVR_STATE_PAUSING &&
atomic_read(&skdev->in_flight) == 0) { skd_in_flight(skdev) == 0) {
skdev->state = SKD_DRVR_STATE_PAUSED; skdev->state = SKD_DRVR_STATE_PAUSED;
wake_up_interruptible(&skdev->waitq); wake_up_interruptible(&skdev->waitq);
} }
@ -1929,8 +1936,6 @@ static void skd_recover_request(struct request *req, void *data, bool reserved)
static void skd_recover_requests(struct skd_device *skdev) static void skd_recover_requests(struct skd_device *skdev)
{ {
blk_mq_tagset_busy_iter(&skdev->tag_set, skd_recover_request, skdev); blk_mq_tagset_busy_iter(&skdev->tag_set, skd_recover_request, skdev);
atomic_set(&skdev->in_flight, 0);
} }
static void skd_isr_msg_from_dev(struct skd_device *skdev) static void skd_isr_msg_from_dev(struct skd_device *skdev)
@ -3560,7 +3565,7 @@ static void skd_log_skdev(struct skd_device *skdev, const char *event)
skd_drive_state_to_str(skdev->drive_state), skdev->drive_state, skd_drive_state_to_str(skdev->drive_state), skdev->drive_state,
skd_skdev_state_to_str(skdev->state), skdev->state); skd_skdev_state_to_str(skdev->state), skdev->state);
dev_dbg(&skdev->pdev->dev, " busy=%d limit=%d dev=%d lowat=%d\n", dev_dbg(&skdev->pdev->dev, " busy=%d limit=%d dev=%d lowat=%d\n",
atomic_read(&skdev->in_flight), skdev->cur_max_queue_depth, skd_in_flight(skdev), skdev->cur_max_queue_depth,
skdev->dev_max_queue_depth, skdev->queue_low_water_mark); skdev->dev_max_queue_depth, skdev->queue_low_water_mark);
dev_dbg(&skdev->pdev->dev, " cycle=%d cycle_ix=%d\n", dev_dbg(&skdev->pdev->dev, " cycle=%d cycle_ix=%d\n",
skdev->skcomp_cycle, skdev->skcomp_ix); skdev->skcomp_cycle, skdev->skcomp_ix);