scsi: put hot fields of scsi_host_template into one cacheline
PATCH v2 1/1 scsi: put hot fields of scsi_host_template into one cacheline
The following three fields of scsi_host_template are referenced in scsi IO submission path, so put them together into one cacheline:
- cmd_size
- queuecommand
- commit_rqs
---
V2:
- move the 3 fields at the beginning of scsi_host_template
- comment why we do this way
include/scsi/scsi_host.h | 72 ++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 33 deletions(-)
include/scsi/scsi_host.h +39 -33
@@ -30,40 +30,15 @@ struct scsi_transport_template;#define MODE_TARGET 0x02struct scsi_host_template { -struct module *module; -const char *name; -/* -* The info function will return whatever useful information the -* developer sees fit. If not provided, then the name field will -* be used instead. -* -* Status: OPTIONAL +* Put fields referenced in IO submission path together in +* same cacheline */ -const char *(* info)(struct Scsi_Host *);/* -* Ioctl interface -* -* Status: OPTIONAL -*/ -int (*ioctl)(struct scsi_device *dev,unsigned int cmd, -void __user *arg); - - -#ifdef CONFIG_COMPAT -/* -* Compat handler. Handle 32bit ABI. -* When unknown ioctl is passed return -ENOIOCTLCMD. -* -* Status: OPTIONAL +* Additional per-command data allocated for the driver. */ -int (*compat_ioctl)(struct scsi_device *dev,unsigned int cmd, -void __user *arg); -#endif - -int (*init_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); -int (*exit_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +unsigned int cmd_size;/* * The queuecommand function is used to queue up a scsi
@@ -111,6 +86,41 @@ struct scsi_host_template {*/ void (*commit_rqs)(struct Scsi_Host *,u16 ); +struct module *module; +const char *name; + +/* +* The info function will return whatever useful information the +* developer sees fit. If not provided, then the name field will +* be used instead. +* +* Status: OPTIONAL +*/ +const char *(* info)(struct Scsi_Host *); + +/* +* Ioctl interface +* +* Status: OPTIONAL +*/ +int (*ioctl)(struct scsi_device *dev,unsigned int cmd, +void __user *arg); + + +#ifdef CONFIG_COMPAT +/* +* Compat handler. Handle 32bit ABI. +* When unknown ioctl is passed return -ENOIOCTLCMD. +* +* Status: OPTIONAL +*/ +int (*compat_ioctl)(struct scsi_device *dev,unsigned int cmd, +void __user *arg); +#endif + +int (*init_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +int (*exit_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +/* * This is an error handling strategy routine. You don't need to * define one of these if you don't want to - there is a default
@@ -468,10 +478,6 @@ struct scsi_host_template {*/ u64 vendor_id; -/* -* Additional per-command data allocated for the driver. -*/ -unsigned int cmd_size;struct scsi_host_cmd_pool *cmd_pool;/* Delay for runtime autosuspend */
Signature · 1 line
2.25.2
Quoted 11 lines · Ming Lei
The following three fields of
scsi_host_templateare referenced in scsi IO submission path, so put them together into one cacheline:-
cmd_size
- queuecommand
-commit_rqsCc Bart Van Assche <[email protected]>Cc Christoph Hellwig <[email protected]>Cc John Garry <[email protected]>Signed-off-by Ming Lei <[email protected]>
FWIW,
Quoted 111 lines
---
V2:
- move the 3 fields at the beginning ofscsi_host_template
- comment why we do this wayinclude/scsi/scsi_host.h | 72 ++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 33 deletions(-)include/scsi/scsi_host.h +39
-33@@ -30,40 +30,15 @@ struct scsi_transport_template;#define MODE_TARGET 0x02struct scsi_host_template { -struct module *module; -const char *name; -/* -* The info function will return whatever useful information the -* developer sees fit. If not provided, then the name field will -* be used instead. -* -* Status: OPTIONAL +* Put fields referenced in IO submission path together in +* same cacheline */ -const char *(* info)(struct Scsi_Host *);/* -* Ioctl interface -* -* Status: OPTIONAL -*/ -int (*ioctl)(struct scsi_device *dev,unsigned int cmd, -void __user *arg); - - -#ifdef CONFIG_COMPAT -/* -* Compat handler. Handle 32bit ABI. -* When unknown ioctl is passed return -ENOIOCTLCMD. -* -* Status: OPTIONAL +* Additional per-command data allocated for the driver. */ -int (*compat_ioctl)(struct scsi_device *dev,unsigned int cmd, -void __user *arg); -#endif - -int (*init_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); -int (*exit_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +unsigned int cmd_size;/* * The queuecommand function is used to queue up a scsi @@ -111,6 +86,41 @@ struct scsi_host_template {*/ void (*commit_rqs)(struct Scsi_Host *,u16 ); +struct module *module; +const char *name; + +/* +* The info function will return whatever useful information the +* developer sees fit. If not provided, then the name field will +* be used instead. +* +* Status: OPTIONAL +*/ +const char *(* info)(struct Scsi_Host *); + +/* +* Ioctl interface +* +* Status: OPTIONAL +*/ +int (*ioctl)(struct scsi_device *dev,unsigned int cmd, +void __user *arg); + + +#ifdef CONFIG_COMPAT +/* +* Compat handler. Handle 32bit ABI. +* When unknown ioctl is passed return -ENOIOCTLCMD. +* +* Status: OPTIONAL +*/ +int (*compat_ioctl)(struct scsi_device *dev,unsigned int cmd, +void __user *arg); +#endif + +int (*init_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +int (*exit_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +/* * This is an error handling strategy routine. You don't need to * define one of these if you don't want to - there is a default @@ -468,10 +478,6 @@ struct scsi_host_template {*/ u64 vendor_id; -/* -* Additional per-command data allocated for the driver. -*/ -unsigned int cmd_size;struct scsi_host_cmd_pool *cmd_pool;/* Delay for runtime autosuspend */
Quoted 6 lines · Ming Lei
The following three fields of
scsi_host_templateare referenced in scsi IO submission path, so put them together into one cacheline:-
cmd_size
- queuecommand
-commit_rqs
James Bottomley
maintainerQuoted 6 lines · Ming Lei
The following three fields of
scsi_host_templateare referenced in scsi IO submission path, so put them together into one cacheline:-
cmd_size
- queuecommand
-commit_rqs
Are there benchmarks to show this actually makes a difference, if so, how much?
James
Quoted 10 lines · James Bottomley
Quoted 6 lines · Ming Lei
The following three fields of
scsi_host_templateare referenced in scsi IO submission path, so put them together into one cacheline:-
cmd_size
- queuecommand
-commit_rqsAre there benchmarks to show this actually makes a difference, if so, how much?
Originally I observed 40% IOPS boost on scsi_debug by moving the three fields into scsi_host, but I lost that test environment now.
When I run fio on scsi_debug in another machine, IOPS gets ~10% boost with this patch.
Thanks,
Ming
Looks good, although you might want to throw in a blurb on the actually measured benefits:
Quoted 3 lines
Looks good, although you might want to throw in a blurb on the actually measured benefits:
Yes, please!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Quoted 11 lines · Ming Lei
The following three fields of
scsi_host_templateare referenced in scsi IO submission path, so put them together into one cacheline:-
cmd_size
- queuecommand
-commit_rqsCc Bart Van Assche <[email protected]>Cc Christoph Hellwig <[email protected]>Cc John Garry <[email protected]>Signed-off-by Ming Lei <[email protected]>
Quoted 7 lines
---
V2:
- move the 3 fields at the beginning ofscsi_host_template
- comment why we do this wayinclude/scsi/scsi_host.h | 72 ++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 33 deletions(-)
Hi,
I would like to test this patch. However it doesn't apply on Martin's tree (all 3 chunks fail). Could you post a clean version?
Doug Gilbert
Ming Lei
Reviewed-by Christoph HellwigQuoted 17 lines · Douglas Gilbert
Quoted 16 lines · Ming Lei
The following three fields of
scsi_host_templateare referenced in scsi IO submission path, so put them together into one cacheline:-
cmd_size
- queuecommand
-commit_rqsCc Bart Van Assche <[email protected]>Cc Christoph Hellwig <[email protected]>Cc John Garry <[email protected]>Signed-off-by Ming Lei <[email protected]>---
V2:
- move the 3 fields at the beginning ofscsi_host_template
- comment why we do this way
Quoted 9 lines
Quoted 2 lines
include/scsi/scsi_host.h | 72 ++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 33 deletions(-)Hi,
I would like to test this patch. However it doesn't apply on Martin's tree (all 3 chunks fail). Could you post a clean version?Doug Gilbert
Hi Doug,
Please try the following one:
From 356220ede9f06a20d90fa387cc84eb63eea2335d Mon Sep 17 00:00:00 2001
From: Ming Lei <[email protected]>
Date: Tue, 21 Apr 2020 17:27:30 +0800
Subject: [PATCH] scsi: put hot fields of scsi_host_template into one cacheline
The following three fields of scsi_host_template are referenced in scsi IO submission path, so put them together into one cacheline:
- cmd_size
- queuecommand
- commit_rqs
--- include/scsi/scsi_host.h | 72 ++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 33 deletions(-)
include/scsi/scsi_host.h +39 -33
@@ -30,40 +30,15 @@ struct scsi_transport_template;#define MODE_TARGET 0x02struct scsi_host_template { -struct module *module; -const char *name; -/* -* The info function will return whatever useful information the -* developer sees fit. If not provided, then the name field will -* be used instead. -* -* Status: OPTIONAL +* Put fields referenced in IO submission path together in +* same cacheline */ -const char *(* info)(struct Scsi_Host *);/* -* Ioctl interface -* -* Status: OPTIONAL -*/ -int (*ioctl)(struct scsi_device *dev,unsigned int cmd, -void __user *arg); - - -#ifdef CONFIG_COMPAT -/* -* Compat handler. Handle 32bit ABI. -* When unknown ioctl is passed return -ENOIOCTLCMD. -* -* Status: OPTIONAL +* Additional per-command data allocated for the driver. */ -int (*compat_ioctl)(struct scsi_device *dev,unsigned int cmd, -void __user *arg); -#endif - -int (*init_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); -int (*exit_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +unsigned int cmd_size;/* * The queuecommand function is used to queue up a scsi
@@ -111,6 +86,41 @@ struct scsi_host_template {*/ void (*commit_rqs)(struct Scsi_Host *,u16 ); +struct module *module; +const char *name; + +/* +* The info function will return whatever useful information the +* developer sees fit. If not provided, then the name field will +* be used instead. +* +* Status: OPTIONAL +*/ +const char *(*info)(struct Scsi_Host *); + +/* +* Ioctl interface +* +* Status: OPTIONAL +*/ +int (*ioctl)(struct scsi_device *dev,unsigned int cmd, +void __user *arg); + + +#ifdef CONFIG_COMPAT +/* +* Compat handler. Handle 32bit ABI. +* When unknown ioctl is passed return -ENOIOCTLCMD. +* +* Status: OPTIONAL +*/ +int (*compat_ioctl)(struct scsi_device *dev,unsigned int cmd, +void __user *arg); +#endif + +int (*init_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +int (*exit_cmd_priv)(struct Scsi_Host *shost,struct scsi_cmnd *cmd); +/* * This is an error handling strategy routine. You don't need to * define one of these if you don't want to - there is a default
@@ -475,10 +485,6 @@ struct scsi_host_template {*/ u64 vendor_id; -/* -* Additional per-command data allocated for the driver. -*/ -unsigned int cmd_size;struct scsi_host_cmd_pool *cmd_pool;/* Delay for runtime autosuspend */
Signature · 6 lines
2.25.2 -- Ming