Skip to contentSkip to conversation

SCSI fixes for 5.3-rc7

GIT PULL Merged James Bottomley 4 participants 4 messages Sep 6, 2019 – Sep 7, 2019

Subsystems (2)
lore
Share & tools
lore

James Bottomley

author maintainer
#0 lore raw

Just a single lpfc fix adjusting the number of available queues for high CPU count systems.

The patch is available here:

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

The short changelog is:

James Smart (1):
scsi: lpfc: Raise config max for lpfc_fcp_mq_threshold variable

And the diffstat:

 drivers/scsi/lpfc/lpfc_attr.c | 2 +-
 drivers/scsi/lpfc/lpfc_sli4.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

With full diff below.

James

---

drivers/scsi/lpfc/lpfc_attr.c +1 -1
index 8d8c495b5b60..d65558619ab0 100644
@@ -5715,7 +5715,7 @@ LPFC_ATTR_RW(nvme_embed_cmd, 1, 0, 2,
  *      0    = Set nr_hw_queues by the number of CPUs or HW queues.
  *      1,128 = Manually specify the maximum nr_hw_queue value to be set,
  *
- * Value range is [0,128]. Default value is 8.
+ * Value range is [0,256]. Default value is 8.
  */
 LPFC_ATTR_R(fcp_mq_threshold, LPFC_FCP_MQ_THRESHOLD_DEF,
 	    LPFC_FCP_MQ_THRESHOLD_MIN, LPFC_FCP_MQ_THRESHOLD_MAX,
drivers/scsi/lpfc/lpfc_sli4.h +1 -1
index 329f7aa7e169..a81ef0293696 100644
@@ -46,7 +46,7 @@
 
 /* FCP MQ queue count limiting */
 #define LPFC_FCP_MQ_THRESHOLD_MIN	0
-#define LPFC_FCP_MQ_THRESHOLD_MAX	128
+#define LPFC_FCP_MQ_THRESHOLD_MAX	256
 #define LPFC_FCP_MQ_THRESHOLD_DEF	8
 
 /* Common buffer size to accomidate SCSI and NVME IO buffers */
#1 lore raw

drivers/scsi/lpfc/lpfc_attr.c LPFC_ATTR_RW(nvme_embed_cmd, 1, 0, 2, · line 5719

Quoted 13 lines · James Bottomley
drivers/scsi/lpfc/lpfc_attr.c +1 -1
index 8d8c495b5b60..d65558619ab0 100644
@@ -5715,7 +5715,7 @@ LPFC_ATTR_RW(nvme_embed_cmd, 1, 0, 2,
  *      0    = Set nr_hw_queues by the number of CPUs or HW queues.
  *      1,128 = Manually specify the maximum nr_hw_queue value to be set,
  *
- * Value range is [0,128]. Default value is 8.
+ * Value range is [0,256]. Default value is 8.
  */

Shouldn't that "1,128 = Manually specify.." line also have been updated?

Not that I really care, and I'll pul this, but..

Linus

#2 lore raw
Quoted 16 lines · Linus Torvalds

drivers/scsi/lpfc/lpfc_attr.c LPFC_ATTR_RW(nvme_embed_cmd, 1, 0, 2, · line 5719

Quoted 12 lines · James Bottomley
drivers/scsi/lpfc/lpfc_attr.c +1 -1
index 8d8c495b5b60..d65558619ab0 100644
@@ -5715,7 +5715,7 @@ LPFC_ATTR_RW(nvme_embed_cmd, 1, 0, 2,
   *      0    = Set nr_hw_queues by the number of CPUs or HW queues.
   *      1,128 = Manually specify the maximum nr_hw_queue value to be set,
   *
- * Value range is [0,128]. Default value is 8.
+ * Value range is [0,256]. Default value is 8.
   */

Shouldn't that "1,128 = Manually specify.." line also have been updated?

Quoted 3 lines

Not that I really care, and I'll pul this, but..

Linus

Yes - thanks

-- james

merge bot Merged
#3 lore raw
In reply to James Bottomley
The pull request you sent on Fri, 06 Sep 2019 16:39:12 -0400:

The pull request you sent on Fri, 06 Sep 2019 16:39:12 -0400:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1e3778cb223e861808ae0daccf353536e7573eed

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker