Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

torvalds · torvalds · commit f51fdffad5b7 · 2016-10-01T07:37:15.000-07:00
Pull SCSI fix from James Bottomley:
 "One final fix before 4.8.

  There was a memory leak triggered by turning scsi mq off due to the
  fact that we assume on host release that the already running hosts
  weren't mq based because that's the state of the global flag (even
  though they were).

  Fix it by tracking this on a per host host basis"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: Avoid that toggling use_blk_mq triggers a memory leak
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
@@ -486,6 +486,8 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 	else
 		shost->dma_boundary = 0xffffffff;
 
+	shost->use_blk_mq = scsi_use_blk_mq;
+
 	device_initialize(&shost->shost_gendev);
 	dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);
 	shost->shost_gendev.bus = &scsi_bus_type;
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
@@ -1160,7 +1160,6 @@ bool scsi_use_blk_mq = true;
 bool scsi_use_blk_mq = false;
 #endif
 module_param_named(use_blk_mq, scsi_use_blk_mq, bool, S_IWUSR | S_IRUGO);
-EXPORT_SYMBOL_GPL(scsi_use_blk_mq);
 
 static int __init init_scsi(void)
 {
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
@@ -29,6 +29,7 @@ extern int scsi_init_hosts(void);
 extern void scsi_exit_hosts(void);
 
 /* scsi.c */
+extern bool scsi_use_blk_mq;
 extern int scsi_setup_command_freelist(struct Scsi_Host *shost);
 extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);
 #ifdef CONFIG_SCSI_LOGGING
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
@@ -771,12 +771,9 @@ static inline int scsi_host_in_recovery(struct Scsi_Host *shost)
 		shost->tmf_in_progress;
 }
 
-extern bool scsi_use_blk_mq;
-
 static inline bool shost_use_blk_mq(struct Scsi_Host *shost)
 {
-	return scsi_use_blk_mq;
-
+	return shost->use_blk_mq;
 }
 
 extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *);

Original file line number	Diff line number	Diff line change
`@@ -1160,7 +1160,6 @@ bool scsi_use_blk_mq = true;`
`1160`	`1160`	`bool scsi_use_blk_mq = false;`
`1161`	`1161`	`#endif`
`1162`	`1162`	`module_param_named(use_blk_mq, scsi_use_blk_mq, bool, S_IWUSR \| S_IRUGO);`
`1163`		`-EXPORT_SYMBOL_GPL(scsi_use_blk_mq);`
`1164`	`1163`
`1165`	`1164`	`static int __init init_scsi(void)`
`1166`	`1165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -771,12 +771,9 @@ static inline int scsi_host_in_recovery(struct Scsi_Host *shost)`
`771`	`771`	`shost->tmf_in_progress;`
`772`	`772`	`}`
`773`	`773`
`774`		`-extern bool scsi_use_blk_mq;`
`775`		`-`
`776`	`774`	`static inline bool shost_use_blk_mq(struct Scsi_Host *shost)`
`777`	`775`	`{`
`778`		`- return scsi_use_blk_mq;`
`779`		`-`
	`776`	`+ return shost->use_blk_mq;`
`780`	`777`	`}`
`781`	`778`
`782`	`779`	`extern int scsi_queue_work(struct Scsi_Host , struct work_struct );`