This is a set of six patches consisting of two MAINTAINER updates, two
scsi-mq fixs for the old parallel interface (not every request is tagged
and we need to set the right flags to populate the SPI tag message) and
a fix for a memory leak in scatterlist traversal caused by a
preallocation update in 3.17) and an ipv6 fix for cxgbi.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-for-linus
The short changelog is:
Anish Bhatt (1):
libcxgbi : support ipv6 address host_param
Christoph Hellwig (2):
scsi: set REQ_QUEUE for the blk-mq case
Revert "block: all blk-mq requests are tagged"
Don Brace (1):
MAINTAINERS: change hpsa and cciss maintainer
Santosh Y (1):
MAINTAINERS: ufs - remove self
Tony Battersby (1):
lib/scatterlist: fix memory leak with scsi-mq
The diffstat is:
MAINTAINERS | 9 ++++++---
drivers/scsi/cxgbi/libcxgbi.c | 42 +++++++++++++++++++++++++++++++++++++-----
drivers/scsi/cxgbi/libcxgbi.h | 5 -----
drivers/scsi/scsi_lib.c | 5 +++++
include/linux/blkdev.h | 3 +--
include/scsi/scsi_tcq.h | 8 ++++----
lib/scatterlist.c | 6 +++---
7 files changed, 56 insertions(+), 22 deletions(-)
With full diff below.
James
---
diff --git a/MAINTAINERS b/MAINTAINERS
index 82d4ad2..dab92a7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4312,10 +4312,8 @@ F: Documentation/blockdev/cpqarray.txt
F: drivers/block/cpqarray.*
HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
-M: Don Brace <don.brace@xxxxxxxx>
+M: "Stephen M. Cameron" <scameron@xxxxxxxxxxxxxxxxxx>
L: iss_storagedev@xxxxxx
-L: storagedev@xxxxxxxx
-L: linux-scsi@xxxxxxxxxxxxxxx
S: Supported
F: Documentation/scsi/hpsa.txt
F: drivers/scsi/hpsa*.[ch]
@@ -4323,10 +4321,8 @@ F: include/linux/cciss*.h
F: include/uapi/linux/cciss*.h
HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
-M: Don Brace <don.brace@xxxxxxxx>
+M: Mike Miller <mike.miller@xxxxxx>
L: iss_storagedev@xxxxxx
-L: storagedev@xxxxxxxx
-L: linux-scsi@xxxxxxxxxxxxxxx
S: Supported
F: Documentation/blockdev/cciss.txt
F: drivers/block/cciss*
@@ -9610,6 +9606,7 @@ F: drivers/staging/unisys/
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
M: Vinayak Holikatti <vinholikatti@xxxxxxxxx>
+M: Santosh Y <santoshsy@xxxxxxxxx>
L: linux-scsi@xxxxxxxxxxxxxxx
S: Supported
F: Documentation/scsi/ufs.txt
diff --git a/drivers/scsi/cxgbi/libcxgbi.c b/drivers/scsi/cxgbi/libcxgbi.c
index 674d498..54fa6e0 100644
--- a/drivers/scsi/cxgbi/libcxgbi.c
+++ b/drivers/scsi/cxgbi/libcxgbi.c
@@ -399,35 +399,6 @@ EXPORT_SYMBOL_GPL(cxgbi_hbas_add);
* If the source port is outside our allocation range, the caller is
* responsible for keeping track of their port usage.
*/
-
-static struct cxgbi_sock *find_sock_on_port(struct cxgbi_device *cdev,
- unsigned char port_id)
-{
- struct cxgbi_ports_map *pmap = &cdev->pmap;
- unsigned int i;
- unsigned int used;
-
- if (!pmap->max_connect || !pmap->used)
- return NULL;
-
- spin_lock_bh(&pmap->lock);
- used = pmap->used;
- for (i = 0; used && i < pmap->max_connect; i++) {
- struct cxgbi_sock *csk = pmap->port_csk[i];
-
- if (csk) {
- if (csk->port_id == port_id) {
- spin_unlock_bh(&pmap->lock);
- return csk;
- }
- used--;
- }
- }
- spin_unlock_bh(&pmap->lock);
-
- return NULL;
-}
-
static int sock_get_port(struct cxgbi_sock *csk)
{
struct cxgbi_device *cdev = csk->cdev;
@@ -778,7 +749,6 @@ static struct cxgbi_sock *cxgbi_check_route6(struct sockaddr *dst_addr)
csk->daddr6.sin6_addr = daddr6->sin6_addr;
csk->daddr6.sin6_port = daddr6->sin6_port;
csk->daddr6.sin6_family = daddr6->sin6_family;
- csk->saddr6.sin6_family = daddr6->sin6_family;
csk->saddr6.sin6_addr = pref_saddr;
neigh_release(n);
@@ -2677,14 +2647,12 @@ int cxgbi_get_host_param(struct Scsi_Host *shost, enum iscsi_host_param param,
break;
case ISCSI_HOST_PARAM_IPADDRESS:
{
- struct cxgbi_sock *csk = find_sock_on_port(chba->cdev,
- chba->port_id);
- if (csk) {
- len = sprintf(buf, "%pIS",
- (struct sockaddr *)&csk->saddr);
- }
+ __be32 addr;
+
+ addr = cxgbi_get_iscsi_ipv4(chba);
+ len = sprintf(buf, "%pI4", &addr);
log_debug(1 << CXGBI_DBG_ISCSI,
- "hba %s, addr %s.\n", chba->ndev->name, buf);
+ "hba %s, ipv4 %pI4.\n", chba->ndev->name, &addr);
break;
}
default:
diff --git a/drivers/scsi/cxgbi/libcxgbi.h b/drivers/scsi/cxgbi/libcxgbi.h
index 2c7cb1c..1d98fad 100644
--- a/drivers/scsi/cxgbi/libcxgbi.h
+++ b/drivers/scsi/cxgbi/libcxgbi.h
@@ -700,6 +700,11 @@ static inline void cxgbi_set_iscsi_ipv4(struct cxgbi_hba *chba, __be32 ipaddr)
chba->ndev->name);
}
+static inline __be32 cxgbi_get_iscsi_ipv4(struct cxgbi_hba *chba)
+{
+ return chba->ipv4addr;
+}
+
struct cxgbi_device *cxgbi_device_register(unsigned int, unsigned int);
void cxgbi_device_unregister(struct cxgbi_device *);
void cxgbi_device_unregister_all(unsigned int flag);
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 50a6e1a..9eff8a3 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1893,11 +1893,6 @@ static int scsi_queue_rq(struct blk_mq_hw_ctx *hctx, struct request *req,
blk_mq_start_request(req);
}
- if (blk_queue_tagged(q))
- req->cmd_flags |= REQ_QUEUED;
- else
- req->cmd_flags &= ~REQ_QUEUED;
-
scsi_init_cmd_errh(cmd);
cmd->scsi_done = scsi_mq_done;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 51d0dc2..0207a78 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1136,7 +1136,8 @@ static inline bool blk_needs_flush_plug(struct task_struct *tsk)
/*
* tag stuff
*/
-#define blk_rq_tagged(rq) ((rq)->cmd_flags & REQ_QUEUED)
+#define blk_rq_tagged(rq) \
+ ((rq)->mq_ctx || ((rq)->cmd_flags & REQ_QUEUED))
extern int blk_queue_start_tag(struct request_queue *, struct request *);
extern struct request *blk_queue_find_tag(struct request_queue *, int);
extern void blk_queue_end_tag(struct request_queue *, struct request *);
diff --git a/include/scsi/scsi_tcq.h b/include/scsi/scsi_tcq.h
index 56ed843..e645835 100644
--- a/include/scsi/scsi_tcq.h
+++ b/include/scsi/scsi_tcq.h
@@ -67,9 +67,8 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
if (!sdev->tagged_supported)
return;
- if (shost_use_blk_mq(sdev->host))
- queue_flag_set_unlocked(QUEUE_FLAG_QUEUED, sdev->request_queue);
- else if (!blk_queue_tagged(sdev->request_queue))
+ if (!shost_use_blk_mq(sdev->host) &&
+ !blk_queue_tagged(sdev->request_queue))
blk_queue_init_tags(sdev->request_queue, depth,
sdev->host->bqt);
@@ -82,7 +81,8 @@ static inline void scsi_activate_tcq(struct scsi_device *sdev, int depth)
**/
static inline void scsi_deactivate_tcq(struct scsi_device *sdev, int depth)
{
- if (blk_queue_tagged(sdev->request_queue))
+ if (!shost_use_blk_mq(sdev->host) &&
+ blk_queue_tagged(sdev->request_queue))
blk_queue_free_tags(sdev->request_queue);
scsi_adjust_queue_depth(sdev, 0, depth);
}
diff --git a/lib/scatterlist.c b/lib/scatterlist.c
index c9f2e8c..9cdf62f 100644
--- a/lib/scatterlist.c
+++ b/lib/scatterlist.c
@@ -203,10 +203,10 @@ void __sg_free_table(struct sg_table *table, unsigned int max_ents,
}
table->orig_nents -= sg_size;
- if (skip_first_chunk)
- skip_first_chunk = false;
- else
+ if (!skip_first_chunk) {
free_fn(sgl, alloc_size);
+ skip_first_chunk = false;
+ }
sgl = next;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
