![Linus Torvalds](/assets/img/avatar_default.png)
This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas, megaraid_sas, zfcp and a host of minor updates. The major driver change here is the elimination of the block based cciss driver in favour of the SCSI based hpsa driver (which now drives all the legacy cases cciss used to be required for). Plus a reset handler clean up and the redo of the SAS SMP handler to use bsg lib. Signed-off-by: James E.J. Bottomley <jejb@linux.vnet.ibm.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABAgAGBQJZscDNAAoJEAVr7HOZEZN4DWIQAK/UkkrvKpV/jLATM/yi7CoL QidY86Hmwwl7A9HQ+2fjLfAsye0xcCzRwkucKK90IP5b4pefHhiJJfiMKAAe3TUW xstnY5z5jaOhDG4nyJFoSm5fH5qXkMnJ8NZRK8f6Qg5yBN5dStEKqoBboNsz4KBI md7idw0mbp5i2GXlJwSpc5eDS97GiPL6WkwgGaGKfXF1NDau0GbEdjijfz55haCD pMhY7WJh/71RfOq/1ThXT1Z3khOlVcKXrkdO+602n7zh/klRBRtBC8m2a6xCfZPj n7Pb/s0jhCQPd+e/Xtv7WEbY8uNOCrGoVgZ6U5EGrT5IeTfep24ackYqerjMhE63 esi4BJY8lUP9SGleLMgjYWyCHdmxBJRa7UI614DWN/H0QoGP6j/2EzGoi5Fw04vC H8/+aqPPWZc9KUBioRYo8xWO8YgMqL2eyXY+Tc9cwxqAe2T6k/NC1zJVgDFKXfzb QoWW4v9NNmYwf5vL/7tNgkeTMFQV66yUR7dR3SGTSk8UIrJ40ok0JyUAsDg86ZAH BfMkWwhWQ6Byoel0Y7Ti88T49Cox/64r/I0ux06Qgg99+KpRLT7z20+GLIEHgXxg 116C39rgvYKqzc7W8RCyj8qSROuMVzg6QFbB6n+1PEsYIX2O8A2Re3jdS34q2LbX aBDm/Lfdl4kkJrV9xY6P =nQUG -----END PGP SIGNATURE----- Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI updates from James Bottomley: "This is mostly updates of the usual suspects: lpfc, qla2xxx, hisi_sas, megaraid_sas, zfcp and a host of minor updates. The major driver change here is the elimination of the block based cciss driver in favour of the SCSI based hpsa driver (which now drives all the legacy cases cciss used to be required for). Plus a reset handler clean up and the redo of the SAS SMP handler to use bsg lib" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (279 commits) scsi: scsi-mq: Always unprepare before requeuing a request scsi: Show .retries and .jiffies_at_alloc in debugfs scsi: Improve requeuing behavior scsi: Call scsi_initialize_rq() for filesystem requests scsi: qla2xxx: Reset the logo flag, after target re-login. scsi: qla2xxx: Fix slow mem alloc behind lock scsi: qla2xxx: Clear fc4f_nvme flag scsi: qla2xxx: add missing includes for qla_isr scsi: qla2xxx: Fix an integer overflow in sysfs code scsi: aacraid: report -ENOMEM to upper layer from aac_convert_sgraw2() scsi: aacraid: get rid of one level of indentation scsi: aacraid: fix indentation errors scsi: storvsc: fix memory leak on ring buffer busy scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough scsi: smartpqi: remove the smp_handler stub scsi: hpsa: remove the smp_handler stub scsi: bsg-lib: pass the release callback through bsg_setup_queue scsi: Rework handling of scsi_device.vpd_pg8[03] scsi: Rework the code for caching Vital Product Data (VPD) scsi: rcu: Introduce rcu_swap_protected() ...
281 lines
7.1 KiB
C
281 lines
7.1 KiB
C
/*
|
|
* BSG helper library
|
|
*
|
|
* Copyright (C) 2008 James Smart, Emulex Corporation
|
|
* Copyright (C) 2011 Red Hat, Inc. All rights reserved.
|
|
* Copyright (C) 2011 Mike Christie
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
#include <linux/slab.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/scatterlist.h>
|
|
#include <linux/bsg-lib.h>
|
|
#include <linux/export.h>
|
|
#include <scsi/scsi_cmnd.h>
|
|
|
|
/**
|
|
* bsg_teardown_job - routine to teardown a bsg job
|
|
* @job: bsg_job that is to be torn down
|
|
*/
|
|
static void bsg_teardown_job(struct kref *kref)
|
|
{
|
|
struct bsg_job *job = container_of(kref, struct bsg_job, kref);
|
|
struct request *rq = job->req;
|
|
|
|
put_device(job->dev); /* release reference for the request */
|
|
|
|
kfree(job->request_payload.sg_list);
|
|
kfree(job->reply_payload.sg_list);
|
|
|
|
blk_end_request_all(rq, BLK_STS_OK);
|
|
}
|
|
|
|
void bsg_job_put(struct bsg_job *job)
|
|
{
|
|
kref_put(&job->kref, bsg_teardown_job);
|
|
}
|
|
EXPORT_SYMBOL_GPL(bsg_job_put);
|
|
|
|
int bsg_job_get(struct bsg_job *job)
|
|
{
|
|
return kref_get_unless_zero(&job->kref);
|
|
}
|
|
EXPORT_SYMBOL_GPL(bsg_job_get);
|
|
|
|
/**
|
|
* bsg_job_done - completion routine for bsg requests
|
|
* @job: bsg_job that is complete
|
|
* @result: job reply result
|
|
* @reply_payload_rcv_len: length of payload recvd
|
|
*
|
|
* The LLD should call this when the bsg job has completed.
|
|
*/
|
|
void bsg_job_done(struct bsg_job *job, int result,
|
|
unsigned int reply_payload_rcv_len)
|
|
{
|
|
struct request *req = job->req;
|
|
struct request *rsp = req->next_rq;
|
|
struct scsi_request *rq = scsi_req(req);
|
|
int err;
|
|
|
|
err = scsi_req(job->req)->result = result;
|
|
if (err < 0)
|
|
/* we're only returning the result field in the reply */
|
|
rq->sense_len = sizeof(u32);
|
|
else
|
|
rq->sense_len = job->reply_len;
|
|
/* we assume all request payload was transferred, residual == 0 */
|
|
rq->resid_len = 0;
|
|
|
|
if (rsp) {
|
|
WARN_ON(reply_payload_rcv_len > scsi_req(rsp)->resid_len);
|
|
|
|
/* set reply (bidi) residual */
|
|
scsi_req(rsp)->resid_len -=
|
|
min(reply_payload_rcv_len, scsi_req(rsp)->resid_len);
|
|
}
|
|
blk_complete_request(req);
|
|
}
|
|
EXPORT_SYMBOL_GPL(bsg_job_done);
|
|
|
|
/**
|
|
* bsg_softirq_done - softirq done routine for destroying the bsg requests
|
|
* @rq: BSG request that holds the job to be destroyed
|
|
*/
|
|
static void bsg_softirq_done(struct request *rq)
|
|
{
|
|
struct bsg_job *job = blk_mq_rq_to_pdu(rq);
|
|
|
|
bsg_job_put(job);
|
|
}
|
|
|
|
static int bsg_map_buffer(struct bsg_buffer *buf, struct request *req)
|
|
{
|
|
size_t sz = (sizeof(struct scatterlist) * req->nr_phys_segments);
|
|
|
|
BUG_ON(!req->nr_phys_segments);
|
|
|
|
buf->sg_list = kzalloc(sz, GFP_KERNEL);
|
|
if (!buf->sg_list)
|
|
return -ENOMEM;
|
|
sg_init_table(buf->sg_list, req->nr_phys_segments);
|
|
scsi_req(req)->resid_len = blk_rq_bytes(req);
|
|
buf->sg_cnt = blk_rq_map_sg(req->q, req, buf->sg_list);
|
|
buf->payload_len = blk_rq_bytes(req);
|
|
return 0;
|
|
}
|
|
|
|
/**
|
|
* bsg_prepare_job - create the bsg_job structure for the bsg request
|
|
* @dev: device that is being sent the bsg request
|
|
* @req: BSG request that needs a job structure
|
|
*/
|
|
static int bsg_prepare_job(struct device *dev, struct request *req)
|
|
{
|
|
struct request *rsp = req->next_rq;
|
|
struct scsi_request *rq = scsi_req(req);
|
|
struct bsg_job *job = blk_mq_rq_to_pdu(req);
|
|
int ret;
|
|
|
|
job->request = rq->cmd;
|
|
job->request_len = rq->cmd_len;
|
|
|
|
if (req->bio) {
|
|
ret = bsg_map_buffer(&job->request_payload, req);
|
|
if (ret)
|
|
goto failjob_rls_job;
|
|
}
|
|
if (rsp && rsp->bio) {
|
|
ret = bsg_map_buffer(&job->reply_payload, rsp);
|
|
if (ret)
|
|
goto failjob_rls_rqst_payload;
|
|
}
|
|
job->dev = dev;
|
|
/* take a reference for the request */
|
|
get_device(job->dev);
|
|
kref_init(&job->kref);
|
|
return 0;
|
|
|
|
failjob_rls_rqst_payload:
|
|
kfree(job->request_payload.sg_list);
|
|
failjob_rls_job:
|
|
kfree(job);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
/**
|
|
* bsg_request_fn - generic handler for bsg requests
|
|
* @q: request queue to manage
|
|
*
|
|
* On error the create_bsg_job function should return a -Exyz error value
|
|
* that will be set to ->result.
|
|
*
|
|
* Drivers/subsys should pass this to the queue init function.
|
|
*/
|
|
static void bsg_request_fn(struct request_queue *q)
|
|
__releases(q->queue_lock)
|
|
__acquires(q->queue_lock)
|
|
{
|
|
struct device *dev = q->queuedata;
|
|
struct request *req;
|
|
int ret;
|
|
|
|
if (!get_device(dev))
|
|
return;
|
|
|
|
while (1) {
|
|
req = blk_fetch_request(q);
|
|
if (!req)
|
|
break;
|
|
spin_unlock_irq(q->queue_lock);
|
|
|
|
ret = bsg_prepare_job(dev, req);
|
|
if (ret) {
|
|
scsi_req(req)->result = ret;
|
|
blk_end_request_all(req, BLK_STS_OK);
|
|
spin_lock_irq(q->queue_lock);
|
|
continue;
|
|
}
|
|
|
|
ret = q->bsg_job_fn(blk_mq_rq_to_pdu(req));
|
|
spin_lock_irq(q->queue_lock);
|
|
if (ret)
|
|
break;
|
|
}
|
|
|
|
spin_unlock_irq(q->queue_lock);
|
|
put_device(dev);
|
|
spin_lock_irq(q->queue_lock);
|
|
}
|
|
|
|
static int bsg_init_rq(struct request_queue *q, struct request *req, gfp_t gfp)
|
|
{
|
|
struct bsg_job *job = blk_mq_rq_to_pdu(req);
|
|
struct scsi_request *sreq = &job->sreq;
|
|
|
|
memset(job, 0, sizeof(*job));
|
|
|
|
scsi_req_init(sreq);
|
|
sreq->sense_len = SCSI_SENSE_BUFFERSIZE;
|
|
sreq->sense = kzalloc(sreq->sense_len, gfp);
|
|
if (!sreq->sense)
|
|
return -ENOMEM;
|
|
|
|
job->req = req;
|
|
job->reply = sreq->sense;
|
|
job->reply_len = sreq->sense_len;
|
|
job->dd_data = job + 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void bsg_exit_rq(struct request_queue *q, struct request *req)
|
|
{
|
|
struct bsg_job *job = blk_mq_rq_to_pdu(req);
|
|
struct scsi_request *sreq = &job->sreq;
|
|
|
|
kfree(sreq->sense);
|
|
}
|
|
|
|
/**
|
|
* bsg_setup_queue - Create and add the bsg hooks so we can receive requests
|
|
* @dev: device to attach bsg device to
|
|
* @name: device to give bsg device
|
|
* @job_fn: bsg job handler
|
|
* @dd_job_size: size of LLD data needed for each job
|
|
*/
|
|
struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
|
|
bsg_job_fn *job_fn, int dd_job_size,
|
|
void (*release)(struct device *))
|
|
{
|
|
struct request_queue *q;
|
|
int ret;
|
|
|
|
q = blk_alloc_queue(GFP_KERNEL);
|
|
if (!q)
|
|
return ERR_PTR(-ENOMEM);
|
|
q->cmd_size = sizeof(struct bsg_job) + dd_job_size;
|
|
q->init_rq_fn = bsg_init_rq;
|
|
q->exit_rq_fn = bsg_exit_rq;
|
|
q->request_fn = bsg_request_fn;
|
|
|
|
ret = blk_init_allocated_queue(q);
|
|
if (ret)
|
|
goto out_cleanup_queue;
|
|
|
|
q->queuedata = dev;
|
|
q->bsg_job_fn = job_fn;
|
|
queue_flag_set_unlocked(QUEUE_FLAG_BIDI, q);
|
|
queue_flag_set_unlocked(QUEUE_FLAG_SCSI_PASSTHROUGH, q);
|
|
blk_queue_softirq_done(q, bsg_softirq_done);
|
|
blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
|
|
|
|
ret = bsg_register_queue(q, dev, name, release);
|
|
if (ret) {
|
|
printk(KERN_ERR "%s: bsg interface failed to "
|
|
"initialize - register queue\n", dev->kobj.name);
|
|
goto out_cleanup_queue;
|
|
}
|
|
|
|
return q;
|
|
out_cleanup_queue:
|
|
blk_cleanup_queue(q);
|
|
return ERR_PTR(ret);
|
|
}
|
|
EXPORT_SYMBOL_GPL(bsg_setup_queue);
|