[PATCH] scsi: mark scsi_dispatch_cmd as noinline

From: Kevin Mitchell
Date: Thu Aug 05 2021 - 19:35:17 EST


When scsi_dispatch_cmd was moved to scsi_lib.c and made static, some
compilers (i.e., at least gcc 8.4.0) decided to compile this
inline. This is a problem for the lkdtm.ko, which needs to insert a
kprobe on this function for the SCSI_DISPATCH_CMD crashpoint.

Mark the function as noinline so as to guarantee the symbol can be found
by register_kprobe.

Fixes: 82042a2cdb55 ("scsi: move scsi_dispatch_cmd to scsi_lib.c")
Signed-off-by: Kevin Mitchell <kevmitch@xxxxxxxxxx>
---
drivers/scsi/scsi_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 7456a26aef51..dbe2d5053d6c 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1443,7 +1443,7 @@ static void scsi_complete(struct request *rq)
* Return: nonzero return request was rejected and device's queue needs to be
* plugged.
*/
-static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
+static noinline int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
{
struct Scsi_Host *host = cmd->device->host;
int rtn = 0;
--
2.32.0